svn commit: samba r24073 - in branches/SAMBA_3_2_0/source: libads param

[metze at samba.org]

Author: metze
Date: 2007-07-30 08:24:10 +0000 (Mon, 30 Jul 2007)
New Revision: 24073

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

Log:
merge from SAMBA_3_2:
Add "client ldap sasl wrapping" parameter.
Possible values are "plain" (default), "sign" or "seal".

metze 
Modified:
   branches/SAMBA_3_2_0/source/libads/ads_struct.c
   branches/SAMBA_3_2_0/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_3_2_0/source/libads/ads_struct.c
===================================================================
--- branches/SAMBA_3_2_0/source/libads/ads_struct.c	2007-07-30 08:22:45 UTC (rev 24072)
+++ branches/SAMBA_3_2_0/source/libads/ads_struct.c	2007-07-30 08:24:10 UTC (rev 24073)
@@ -109,6 +109,7 @@
 		     const char *ldap_server)
 {
 	ADS_STRUCT *ads;
+	int wrap_flags;
 	
 	ads = SMB_XMALLOC_P(ADS_STRUCT);
 	ZERO_STRUCTP(ads);
@@ -128,6 +129,13 @@
 	/* the caller will own the memory by default */
 	ads->is_mine = 1;
 
+	wrap_flags = lp_client_ldap_sasl_wrapping();
+	if (wrap_flags == -1) {
+		wrap_flags = 0;
+	}
+
+	ads->auth.flags = wrap_flags;
+
 	return ads;
 }
 

Modified: branches/SAMBA_3_2_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_2_0/source/param/loadparm.c	2007-07-30 08:22:45 UTC (rev 24072)
+++ branches/SAMBA_3_2_0/source/param/loadparm.c	2007-07-30 08:24:10 UTC (rev 24073)
@@ -325,6 +325,7 @@
 	int name_cache_timeout;
 	int client_signing;
 	int server_signing;
+	int client_ldap_sasl_wrapping;
 	int iUsershareMaxShares;
 	int iIdmapCacheTime;
 	int iIdmapNegativeCacheTime;
@@ -690,6 +691,13 @@
 	{-1, NULL}
 };
 
+static const struct enum_list enum_ldap_sasl_wrapping[] = {
+	{0, "plain"},
+	{ADS_AUTH_SASL_SIGN, "sign"},
+	{ADS_AUTH_SASL_SEAL, "seal"},
+	{-1, NULL}
+};
+
 static const struct enum_list enum_ldap_ssl[] = {
 	{LDAP_SSL_OFF, "no"},
 	{LDAP_SSL_OFF, "No"},
@@ -1017,7 +1025,7 @@
 	{"client signing", P_ENUM, P_GLOBAL, &Globals.client_signing, NULL, enum_smb_signing_vals, FLAG_ADVANCED}, 
 	{"server signing", P_ENUM, P_GLOBAL, &Globals.server_signing, NULL, enum_smb_signing_vals, FLAG_ADVANCED}, 
 	{"client use spnego", P_BOOL, P_GLOBAL, &Globals.bClientUseSpnego, NULL, NULL, FLAG_ADVANCED}, 
-
+	{"client ldap sasl wrapping", P_ENUM, P_GLOBAL, &Globals.client_ldap_sasl_wrapping, NULL, enum_ldap_sasl_wrapping, FLAG_ADVANCED},
 	{"enable asu support", P_BOOL, P_GLOBAL, &Globals.bASUSupport, NULL, NULL, FLAG_ADVANCED}, 
 	{"svcctl list", P_LIST, P_GLOBAL, &Globals.szServicesList, NULL, NULL, FLAG_ADVANCED},
 
@@ -2183,6 +2191,7 @@
 FN_GLOBAL_INTEGER(lp_name_cache_timeout, &Globals.name_cache_timeout)
 FN_GLOBAL_INTEGER(lp_client_signing, &Globals.client_signing)
 FN_GLOBAL_INTEGER(lp_server_signing, &Globals.server_signing)
+FN_GLOBAL_INTEGER(lp_client_ldap_sasl_wrapping, &Globals.client_ldap_sasl_wrapping)
 
 /* local prototypes */