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/wscript | |
| 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/wscript')
| -rw-r--r-- | source3/wscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/wscript b/source3/wscript index 7f178a4c55..175bbf12ef 100644 --- a/source3/wscript +++ b/source3/wscript @@ -574,7 +574,7 @@ msg.msg_acctrightslen = sizeof(fd); # Check for LDAP if Options.options.with_ldap: - conf.CHECK_HEADERS('ldap.h lber.h') + conf.CHECK_HEADERS('ldap.h lber.h ldap_pvt.h') conf.CHECK_TYPE('ber_tag_t', 'unsigned int', headers='ldap.h lber.h') conf.CHECK_FUNCS_IN('ber_scanf ber_sockbuf_add_io', 'lber') conf.CHECK_VARIABLE('LDAP_OPT_SOCKBUF', headers='ldap.h') @@ -584,7 +584,7 @@ msg.msg_acctrightslen = sizeof(fd); conf.CHECK_VARIABLE('LBER_OPT_LOG_PRINT_FN', define='HAVE_LBER_LOG_PRINT_FN', headers='lber.h') - conf.CHECK_FUNCS_IN('ldap_init ldap_initialize ldap_set_rebind_proc', 'ldap') + conf.CHECK_FUNCS_IN('ldap_init ldap_init_fd ldap_initialize ldap_set_rebind_proc', 'ldap') conf.CHECK_FUNCS_IN('ldap_add_result_entry', 'ldap') # Check if ldap_set_rebind_proc() takes three arguments |