s3-smbldap: move ldap_open_with_timeout out of smb_ldap.h to ads where it lives.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Nov 17 03:47:53 CET 2011 on sn-devel-104

diff --git a/source3/include/smb_ldap.h b/source3/include/smb_ldap.h
index eef47a4069b4e9c627366197ecfb3f7052af089e..eaa127676b9ab36f3eeaf90ef17ba693715e3193 100644 (file)
--- a/source3/include/smb_ldap.h
+++ b/source3/include/smb_ldap.h
@@ -49,15 +49,6 @@ typedef int ber_int_t;
 #include <ldap_pvt.h>
 #endif /* HAVE_LDAP_PVT_H */
 
-#ifdef HAVE_LDAP_INIT_FD
-int ldap_init_fd(ber_socket_t fd, int proto, char *uri, LDAP **ldp);
-#endif
-
-/* function declarations not included in proto.h */
-LDAP *ldap_open_with_timeout(const char *server,
-                            struct sockaddr_storage *ss,
-                            int port, unsigned int to);
-
 /* Solaris 8 and maybe other LDAP implementations spell this "..._INPROGRESS": */
 #if defined(LDAP_SASL_BIND_INPROGRESS) && !defined(LDAP_SASL_BIND_IN_PROGRESS)
 #define LDAP_SASL_BIND_IN_PROGRESS LDAP_SASL_BIND_INPROGRESS

diff --git a/source3/libads/ads_ldap_protos.h b/source3/libads/ads_ldap_protos.h
index 0fb7134994845a5e772dcdf9a3c35eb681c80169..83b6fc13da6713600725b2d0d109ccb220c36162 100644 (file)
--- a/source3/libads/ads_ldap_protos.h
+++ b/source3/libads/ads_ldap_protos.h
@@ -24,10 +24,17 @@
 #ifndef _LIBADS_ADS_LDAP_PROTOS_H_
 #define _LIBADS_ADS_LDAP_PROTOS_H_
 
+#ifdef HAVE_LDAP_INIT_FD
+int ldap_init_fd(ber_socket_t fd, int proto, char *uri, LDAP **ldp);
+#endif
+
 /*
  * Prototypes for ads
  */
 
+LDAP *ldap_open_with_timeout(const char *server,
+                            struct sockaddr_storage *ss,
+                            int port, unsigned int to);
 void ads_msgfree(ADS_STRUCT *ads, LDAPMessage *msg);
 char *ads_get_dn(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, LDAPMessage *msg);
 

diff --git a/source3/winbindd/winbindd_msrpc.c b/source3/winbindd/winbindd_msrpc.c
index 27eac6b41de4ab35f87251be25207a6c7079b9db..455de3d54c3b9be5250e126a3690ef9f7dab4f86 100644 (file)
--- a/source3/winbindd/winbindd_msrpc.c
+++ b/source3/winbindd/winbindd_msrpc.c
@@ -769,7 +769,7 @@ static NTSTATUS msrpc_lookup_groupmem(struct winbindd_domain *domain,
 
 #ifdef HAVE_LDAP
 
-#include "smb_ldap.h"
+#include "ads.h"
 
 static int get_ldap_seq(const char *server, struct sockaddr_storage *ss, int port, uint32 *seq)
 {