svn commit: samba r15994 - in trunk/source/lib: .

[jra at samba.org]

Author: jra
Date: 2006-06-01 19:25:19 +0000 (Thu, 01 Jun 2006)
New Revision: 15994

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15994

Log:
Make smbldap obey config tests. Patch from "John E. Malmberg"
<wb8tyw at qsl.net>.
Jeremy.

Modified:
   trunk/source/lib/smbldap.c


Changeset:
Modified: trunk/source/lib/smbldap.c
===================================================================
--- trunk/source/lib/smbldap.c	2006-06-01 17:59:05 UTC (rev 15993)
+++ trunk/source/lib/smbldap.c	2006-06-01 19:25:19 UTC (rev 15994)
@@ -944,6 +944,7 @@
 	DEBUG(10,("ldap_connect_system: Binding to ldap server %s as \"%s\"\n",
 		  ldap_state->uri, ldap_dn));
 
+#ifdef HAVE_LDAP_SET_REBIND_PROC
 #if defined(LDAP_API_FEATURE_X_OPENLDAP) && (LDAP_API_VERSION > 2000)
 # if LDAP_SET_REBIND_PROC_ARGS == 2	
 	ldap_set_rebind_proc(ldap_struct, &rebindproc_connect);	
@@ -959,6 +960,7 @@
 	ldap_set_rebind_proc(ldap_struct, &rebindproc_with_state, (void *)ldap_state);	
 # endif
 #endif /*defined(LDAP_API_FEATURE_X_OPENLDAP) && (LDAP_API_VERSION > 2000)*/
+#endif
 
 	rc = ldap_simple_bind_s(ldap_struct, ldap_dn, ldap_secret);
 
@@ -1009,7 +1011,11 @@
 
 	if ((ldap_state->ldap_struct != NULL) && ((ldap_state->last_ping + SMBLDAP_DONT_PING_TIME) < time(NULL))) {
 
+#ifdef HAVE_UNIXSOCKET
 		struct sockaddr_un addr;
+#else
+		struct sockaddr addr;
+#endif
 		socklen_t len = sizeof(addr);
 		int sd;