Changeset 221 for branches/samba-3.3.x/source/param/loadparm.c

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

File:

• branches/samba-3.3.x/source/param/loadparm.c (modified) (4 diffs)

branches/samba-3.3.x/source/param/loadparm.c

@@ -251 +251 @@
         char *szLdapGroupSuffix;
         int ldap_ssl;
+        bool ldap_ssl_ads;
         char *szLdapSuffix;
         char *szLdapAdminDn;
@@ -3577 +3578 @@
         },
         {
+                .label          = "ldap ssl ads",
+                .type           = P_BOOL,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.ldap_ssl_ads,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED,
+        },
+        {
                 .label          = "ldap timeout",
                 .type           = P_INTEGER,
@@ -4803 +4813 @@
         string_set(&Globals.szLdapAdminDn, "");
         Globals.ldap_ssl = LDAP_SSL_START_TLS;
+        Globals.ldap_ssl_ads = False;
         Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
         Globals.ldap_delete_dn = False;
@@ -5126 +5137 @@
 FN_GLOBAL_STRING(lp_ldap_admin_dn, &Globals.szLdapAdminDn)
 FN_GLOBAL_INTEGER(lp_ldap_ssl, &Globals.ldap_ssl)
+FN_GLOBAL_BOOL(lp_ldap_ssl_ads, &Globals.ldap_ssl_ads)
 FN_GLOBAL_INTEGER(lp_ldap_passwd_sync, &Globals.ldap_passwd_sync)
 FN_GLOBAL_BOOL(lp_ldap_delete_dn, &Globals.ldap_delete_dn)