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

Timestamp:

Aug 5, 2009, 6:34:45 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.0 to final 3.0.36 (source)

File:

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

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

@@ -151 +151 @@
         char *szPanicAction;
         char *szAddUserScript;
-        char *szRenameUserScript;
+        char *szRenameUserScript;
         char *szDelUserScript;
         char *szAddGroupScript;
@@ -188 +188 @@
         char *szChangeShareCommand;
         char *szDeleteShareCommand;
-        char **szEventLogs;
+char **szEventLogs;
         char *szGuestaccount;
         char *szManglingMethod;
@@ -472 +472 @@
         False,                  /* not autoloaded */
         0,                      /* not a usershare */
-        (time_t)0,              /* No last mod time */
+        (time_t)0,            /* No last mod time */
         NULL,                   /* szService */
         NULL,                   /* szPath */
@@ -513 +513 @@
         NULL,                   /* fstype */
         NULL,                   /* vfs objects */
-        NULL,                   /* szMSDfsProxy */
+        NULL,              /* szMSDfsProxy */
         NULL,                   /* szAioWriteBehind */
         NULL,                   /* szDfree */
@@ -533 +533 @@
         2,                      /* iOplockContentionLimit */
         0,                      /* iCSCPolicy */
-        1024,                   /* iBlock_size */
+        1024,           /* iBlock_size */
         0,                      /* iDfreeCacheTime */
         False,                  /* bPreexecClose */
@@ -588 +588 @@
         False,                  /* bForcePrintername */
         True,                   /* bNTAclSupport */
-        False,                  /* bForceUnknownAclUser */
+        False,            /* bForceUnknownAclUser */
         False,                  /* bUseSendfile */
         False,                  /* bProfileAcls */
@@ -821 +821 @@
         {MAP_TO_GUEST_ON_BAD_USER, "Bad User"},
         {MAP_TO_GUEST_ON_BAD_PASSWORD, "Bad Password"},
-        {MAP_TO_GUEST_ON_BAD_UID, "Bad Uid"},
+        {MAP_TO_GUEST_ON_BAD_UID, "Bad Uid"},
         {-1, NULL}
 };
@@ -834 +834 @@
  *       Any parameter that does NOT have FLAG_ADVANCED will not disply at all
  *       Set FLAG_SHARE and FLAG_PRINT to specifically display parameters in
- *        respective views.
+ *      respective views.
  *
  * NOTE2: Handling of duplicated (synonym) paramters:
@@ -1122 +1122 @@
 
         {"add user script", P_STRING, P_GLOBAL, &Globals.szAddUserScript, NULL, NULL, FLAG_ADVANCED}, 
-        {"rename user script", P_STRING, P_GLOBAL, &Globals.szRenameUserScript, NULL, NULL, FLAG_ADVANCED},
+        {"rename user script", P_STRING, P_GLOBAL, &Globals.szRenameUserScript, NULL, NULL, FLAG_ADVANCED},
         {"delete user script", P_STRING, P_GLOBAL, &Globals.szDelUserScript, NULL, NULL, FLAG_ADVANCED}, 
         {"add group script", P_STRING, P_GLOBAL, &Globals.szAddGroupScript, NULL, NULL, FLAG_ADVANCED}, 
@@ -1418 +1418 @@
         pstring s;
 
-        /* If requested to initialize only once and we've already done it... */
-        if (first_time_only && done_init) {
-                /* ... then we have nothing more to do */
-                return;
-        }
+        /* If requested to initialize only once and we've already done it... */
+        if (first_time_only && done_init) {
+                /* ... then we have nothing more to do */
+                return;
+        }
 
         if (!done_init) {
@@ -1462 +1462 @@
 
 #if defined (__OS2__)
-        /* search the system codepage and set OS2CodePageStr */
-        unsigned long _System DosQueryCp (unsigned long ulLength, unsigned long *pCodePageList, unsigned long *pDataLength);
-        pstring OS2CodePageStr;
-        unsigned long OS2CodePage[3];
-        unsigned long OS2CodePageLen;
-        if ( DosQueryCp( sizeof(OS2CodePage), OS2CodePage, &OS2CodePageLen ) )
-           slprintf(OS2CodePageStr, sizeof(OS2CodePageStr) -1, "SYSTEM");
-          else
-           slprintf(OS2CodePageStr, sizeof(OS2CodePageStr) -1, "IBM-%u", OS2CodePage[0]);
+        /* search the system codepage and set OS2CodePageStr */
+        unsigned long _System DosQueryCp (unsigned long ulLength, unsigned long *pCodePageList, unsigned long *pDataLength);
+        pstring OS2CodePageStr;
+        unsigned long OS2CodePage[3];
+        unsigned long OS2CodePageLen;
+        if ( DosQueryCp( sizeof(OS2CodePage), OS2CodePage, &OS2CodePageLen ) )
+                slprintf(OS2CodePageStr, sizeof(OS2CodePageStr) -1, "SYSTEM");
+        else
+                slprintf(OS2CodePageStr, sizeof(OS2CodePageStr) -1, "IBM-%u", OS2CodePage[0]);
 #endif
 
@@ -1492 +1492 @@
            characters - default to system codepage */
         string_set(&Globals.display_charset, OS2CodePageStr);
-#endif  
+#endif
 
 #else
@@ -2238 +2238 @@
         BOOL global_section = False;
         char* param_key;
-        param_opt_struct *data;
+        param_opt_struct *data;
         
         if (snum >= iNumServices) return NULL;
@@ -2268 +2268 @@
                 data = Globals.param_opt;
                 while (data) {
-                        if (strcmp(data->key, param_key) == 0) {
-                                string_free(&param_key);
+                        if (strcmp(data->key, param_key) == 0) {
+                                string_free(&param_key);
                                 return data;
                         }
@@ -2486 +2486 @@
 {
         int i;
-        param_opt_struct *data, *pdata;
+        param_opt_struct *data, *pdata;
         if (!pservice)
                 return;
@@ -2670 +2670 @@
                 DEBUG(10,("hash_a_service: creating tdb servicehash\n"));
                 ServiceHash = tdb_open("servicehash", 1031, TDB_INTERNAL, 
-                                        (O_RDWR|O_CREAT), 0600);
+                                        (O_RDWR|O_CREAT), 0600);
                 if ( !ServiceHash ) {
                         DEBUG(0,("hash_a_service: open tdb servicehash failed!\n"));
@@ -2683 +2683 @@
                 return False;
 
-        tdb_store_int32(ServiceHash, canon_name, idx);
+        tdb_store_int32(ServiceHash, canon_name, idx);
 
         return True;