diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-26 13:53:45 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-28 05:30:21 +0200 |
| commit | a427652010820fdf8fa82cf425f5162cc70348e0 (patch) | |
| tree | 640a2539c113d6b508e4cdd4aea15d512da9c580 /source3/include | |
| parent | ab46d6610104b899ca8ac7cb695d8d18e5dc34ed (diff) | |
| download | samba-a427652010820fdf8fa82cf425f5162cc70348e0.tar.gz samba-a427652010820fdf8fa82cf425f5162cc70348e0.tar.bz2 samba-a427652010820fdf8fa82cf425f5162cc70348e0.zip | |
s3-libads: Use ldap_init_fd() to connect to AD server in socket_wrapper
This means that we control the connection setup, don't rely on signals
for timeouts and the connection uses socket_wrapper where that is
required in our test environment.
According to bug reports, this method is also used by curl and other
tools, so we are not the first to (ab)use the OpenLDAP libs in this
way.
It is ONLY enabled for socket_wrapper at this time, as this is the
best way to get 'make test' working for S3 winbind tests in an S4
domain.
Andrew Bartlett
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/smb_ldap.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source3/include/smb_ldap.h b/source3/include/smb_ldap.h index 45e586859d..7165de19bf 100644 --- a/source3/include/smb_ldap.h +++ b/source3/include/smb_ldap.h @@ -37,7 +37,14 @@ typedef int ber_int_t; #endif /* function declarations not included in proto.h */ -LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to); +LDAP *ldap_open_with_timeout(const char *server, + struct sockaddr_storage *ss, + int port, unsigned int to); + +#ifdef HAVE_LDAP_PVT_H +#include <ldap_pvt.h> +#endif +int ldap_init_fd(ber_socket_t fd, int proto, char *uri, LDAP **ldp); #endif /* HAVE_LDAP_H */ |