Changeset 124 for branches/samba-3.0/source/param/loadparm.c

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

File:

• branches/samba-3.0/source/param/loadparm.c (modified) (11 diffs)

branches/samba-3.0/source/param/loadparm.c

@@ -238 +238 @@
         char *szLdapSuffix;
         char *szLdapAdminDn;
+        int ldap_debug_level;
+        int ldap_debug_threshold;
         int iAclCompat;
         char *szCupsServer;
@@ -404 +406 @@
         BOOL bNo_set_dir;
         BOOL bGuest_only;
+        BOOL bAdministrative_share;
         BOOL bGuest_ok;
         BOOL bPrint_ok;
@@ -546 +549 @@
         True,                   /* bNo_set_dir */
         False,                  /* bGuest_only */
+        False,                  /* bAdministrative_share */
         False,                  /* bGuest_ok */
         False,                  /* bPrint_ok */
@@ -635 +639 @@
 static BOOL handle_charset( int snum, const char *pszParmValue, char **ptr );
 static BOOL handle_printing( int snum, const char *pszParmValue, char **ptr);
+static BOOL handle_ldap_debug_level( int snum, const char *pszParmValue, char **ptr);
 
 static void set_server_role(void);
@@ -936 +941 @@
         {"guest only", P_BOOL, P_LOCAL, &sDefault.bGuest_only, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE}, 
         {"only guest", P_BOOL, P_LOCAL, &sDefault.bGuest_only, NULL, NULL, FLAG_HIDE}, 
+        {"administrative share", P_BOOL, P_LOCAL, &sDefault.bAdministrative_share, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT},
 
         {"guest ok", P_BOOL, P_LOCAL, &sDefault.bGuest_ok, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT}, 
@@ -1189 +1195 @@
         {"ldap page size", P_INTEGER, P_GLOBAL, &Globals.ldap_page_size, NULL, NULL, FLAG_ADVANCED},
         {"ldap user suffix", P_STRING, P_GLOBAL, &Globals.szLdapUserSuffix, NULL, NULL, FLAG_ADVANCED}, 
+
+        {"ldap debug level", P_INTEGER, P_GLOBAL, &Globals.ldap_debug_level, handle_ldap_debug_level, NULL, FLAG_ADVANCED},
+        {"ldap debug threshold", P_INTEGER, P_GLOBAL, &Globals.ldap_debug_threshold, NULL, NULL, FLAG_ADVANCED},
+
 
         {N_("Miscellaneous Options"), P_SEP, P_SEPARATOR}, 
@@ -1614 +1624 @@
         Globals.ldap_page_size = LDAP_PAGE_SIZE;
 
+        Globals.ldap_debug_level = 0;
+        Globals.ldap_debug_threshold = 10;
+
         /* This is what we tell the afs client. in reality we set the token 
          * to never expire, though, when this runs out the afs client will 
@@ -1940 +1953 @@
 FN_GLOBAL_INTEGER(lp_ldap_timeout, &Globals.ldap_timeout)
 FN_GLOBAL_INTEGER(lp_ldap_page_size, &Globals.ldap_page_size)
+FN_GLOBAL_INTEGER(lp_ldap_debug_level, &Globals.ldap_debug_level)
+FN_GLOBAL_INTEGER(lp_ldap_debug_threshold, &Globals.ldap_debug_threshold)
 FN_GLOBAL_STRING(lp_add_share_cmd, &Globals.szAddShareCommand)
 FN_GLOBAL_STRING(lp_change_share_cmd, &Globals.szChangeShareCommand)
@@ -2103 +2118 @@
 FN_LOCAL_BOOL(lp_guest_ok, bGuest_ok)
 FN_LOCAL_BOOL(lp_guest_only, bGuest_only)
+FN_LOCAL_BOOL(lp_administrative_share, bAdministrative_share)
 FN_LOCAL_BOOL(lp_print_ok, bPrint_ok)
 FN_LOCAL_BOOL(lp_map_hidden, bMap_hidden)
@@ -2723 +2739 @@
         ServicePtrs[i]->bRead_only = True;
         ServicePtrs[i]->bGuest_only = False;
+        ServicePtrs[i]->bAdministrative_share = True;
         ServicePtrs[i]->bGuest_ok = guest_ok;
         ServicePtrs[i]->bPrint_ok = False;
@@ -3247 +3264 @@
         free_service(&serviceTemp);
         return (bRetval);
+}
+
+static BOOL handle_ldap_debug_level(int snum, const char *pszParmValue, char **ptr)
+{
+        Globals.ldap_debug_level = lp_int(pszParmValue);
+        init_ldap_debugging();
+        return True;
 }