diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-06-17 02:48:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:20 -0500 |
| commit | 44a04d74cdcc4b4dc75312a40b34d60e1d9a001b (patch) | |
| tree | 86d5f1b39b7647e1c247a73acf25fd8027bc3c33 /source4 | |
| parent | 03b0f279ed7d1ed7083e0c2301af94ff39f0e8a4 (diff) | |
| download | samba-44a04d74cdcc4b4dc75312a40b34d60e1d9a001b.tar.gz samba-44a04d74cdcc4b4dc75312a40b34d60e1d9a001b.tar.bz2 samba-44a04d74cdcc4b4dc75312a40b34d60e1d9a001b.zip | |
r7668: - setup HAVE_ILDAP to enable the ildap backend in ldb
- fixed a bug in socket_connect_ev()
(This used to be commit 3f77b879a035929a843e02b798d54eba6625bde7)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/include/includes.h | 3 | ||||
| -rw-r--r-- | source4/lib/socket/connect.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h index 9ecfd20422..85a023338a 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -83,6 +83,9 @@ #define HAVE_ADS #endif +/* tell ldb we have the internal ldap code */ +#define HAVE_ILDAP 1 + /* * Define VOLATILE if needed. */ diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c index e7f2a11daf..abe474720c 100644 --- a/source4/lib/socket/connect.c +++ b/source4/lib/socket/connect.c @@ -56,7 +56,8 @@ NTSTATUS socket_connect_ev(struct socket_context *sock, status = socket_connect(sock, my_address, my_port, server_address, server_port, flags); - if (NT_STATUS_IS_ERR(status)) { + if (NT_STATUS_IS_ERR(status) && + !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) { return status; } |