diff options
author | Andrew Tridgell <tridge@samba.org> | 2004-11-03 10:09:48 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:23 -0500 |
commit | dde07058075d357cfdc63624c8dcaa67ebd40add (patch) | |
tree | c3f29090e37f1bc103a3d6051e708d1ebbe305a5 /source4/ldap_server | |
parent | 90a8c4acc7e673e6439197776d19cc4b095ac322 (diff) | |
download | samba-dde07058075d357cfdc63624c8dcaa67ebd40add.tar.gz samba-dde07058075d357cfdc63624c8dcaa67ebd40add.tar.bz2 samba-dde07058075d357cfdc63624c8dcaa67ebd40add.zip |
r3507: - added deferred replies on sharing violation in pvfs open. The
deferred reply is short-circuited immediately when the file is
closed by another user, allowing it to be opened by the waiting user.
- added a sane set of timeval manipulation routines
- converted all the events code and code that uses it to use struct
timeval instead of time_t, which allows for microsecond resolution
instead of 1 second resolution. This was needed for doing the pvfs
deferred open code, and is why the patch is so big.
(This used to be commit 0d51511d408d91eb5f68a35e980e0875299b1831)
Diffstat (limited to 'source4/ldap_server')
-rw-r--r-- | source4/ldap_server/ldap_server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 3b4ccb6b73..9338baa165 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -440,7 +440,7 @@ NTSTATUS ldapsrv_flush_responses(struct ldapsrv_connection *conn) /* called when a LDAP socket becomes readable */ -static void ldapsrv_recv(struct server_connection *conn, time_t t, +static void ldapsrv_recv(struct server_connection *conn, struct timeval t, uint16_t flags) { struct ldapsrv_connection *ldap_conn = conn->private_data; @@ -536,7 +536,7 @@ static void ldapsrv_recv(struct server_connection *conn, time_t t, /* called when a LDAP socket becomes writable */ -static void ldapsrv_send(struct server_connection *conn, time_t t, +static void ldapsrv_send(struct server_connection *conn, struct timeval t, uint16_t flags) { struct ldapsrv_connection *ldap_conn = conn->private_data; @@ -558,7 +558,7 @@ static void ldapsrv_send(struct server_connection *conn, time_t t, /* called when connection is idle */ -static void ldapsrv_idle(struct server_connection *conn, time_t t) +static void ldapsrv_idle(struct server_connection *conn, struct timeval t) { DEBUG(10,("ldapsrv_idle: not implemented!\n")); return; |