diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-10-28 08:36:23 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:04:53 -0500 |
| commit | c4cff94beb3eb8e78aa4a291ff0d8eea9512c6c0 (patch) | |
| tree | 2a02d4605945007621f3afda94910f99cf9d5504 | |
| parent | c272e60955bff28ff6431fd50e94807aca1ea016 (diff) | |
| download | samba-c4cff94beb3eb8e78aa4a291ff0d8eea9512c6c0.tar.gz samba-c4cff94beb3eb8e78aa4a291ff0d8eea9512c6c0.tar.bz2 samba-c4cff94beb3eb8e78aa4a291ff0d8eea9512c6c0.zip | |
r3316: give the LDAP server a chance of operating correctly non-blocking (it
didn't handle EINTR or EAGAIN)
(This used to be commit c35a8f92c2df354e972ced9371d33657ce99988e)
| -rw-r--r-- | source4/ldap_server/ldap_server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 70191c4827..a9aea2b449 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -163,7 +163,7 @@ static BOOL read_into_buf(struct socket_context *sock, struct rw_buffer *buf) } status = socket_recv(sock, tmp_blob.data, tmp_blob.length, &nread, 0); - if (!NT_STATUS_IS_OK(status)) { + if (NT_STATUS_IS_ERR(status)) { DEBUG(10,("socket_recv: %s\n",nt_errstr(status))); talloc_free(tmp_blob.data); return False; @@ -207,7 +207,7 @@ static BOOL ldapsrv_read_buf(struct ldapsrv_connection *conn) } status = socket_recv(sock, tmp_blob.data, tmp_blob.length, &nread, 0); - if (!NT_STATUS_IS_OK(status)) { + if (NT_STATUS_IS_ERR(status)) { DEBUG(10,("socket_recv: %s\n",nt_errstr(status))); talloc_free(mem_ctx); return False; |