ohnobinki_overlay Files · net-fs/samba-tng/files/0.4.99/00_all_0.4.99-ldap-rebind-fix.diff

Files @ 3353ad542e61

Branch filter:

Location: ohnobinki_overlay/net-fs/samba-tng/files/0.4.99/00_all_0.4.99-ldap-rebind-fix.diff

3353ad542e61 1.4 KiB text/x-diff Show Annotation Show as Raw Download as Raw

binki

Bumped to live-2010.04.09, attempting to follow changes for the corresponding bump in portage. Need for bump reported by geos_one.
(Portage version: 2.2_rc67-r8/hg/Linux x86_64)
(Signed Manifest commit)

Index: passdb/ldap.c
===================================================================
RCS file: /work/cvs/tng/source/passdb/ldap.c,v
retrieving revision 1.51
diff -u -p -r1.51 ldap.c
--- passdb/ldap.c	3 Sep 2005 18:01:10 -0000	1.51
+++ passdb/ldap.c	15 Sep 2005 21:17:06 -0000
@@ -72,6 +72,18 @@ static int rebindproc_with_state  (LDAP 
 	}
 	return 0;
 }
+
+/**
+ * ldap rebindproc for 1.* with two args
+ */
+#  if LDAP_SET_REBIND_PROC_ARGS == 2     
+static int rebindproc (LDAP *ld, char **whop, char **credp,
+		       int *method, int freeit )
+{
+	return rebindproc_with_state(ld, whop, credp,
+				   method, freeit, NULL);
+}
+#  endif
 #endif
 
 /*******************************************************************
@@ -93,17 +105,6 @@ static int rebindproc_connect_with_state
 }
 #endif /*defined(LDAP_API_FEATURE_X_OPENLDAP) && (LDAP_API_VERSION > 2000)*/
 
-/*******************************************************************
- Add a rebind function for authenticated referrals
-******************************************************************/
-#if LDAP_SET_REBIND_PROC_ARGS == 2     
-static int rebindproc (LDAP *ld, char **whop, char **credp,
-		       int *method, int freeit )
-{
-	return rebindproc_with_state(ld, whop, credp,
-				   method, freeit, NULL);
-}
-#endif
 
 /*******************************************************************
  a rebind function for authenticated referrals