Changeset 736 for branches/samba-3.5.x/source3/param

Timestamp:

Nov 12, 2012, 5:38:52 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.16

File:

• branches/samba-3.5.x/source3/param/loadparm.c (modified) (2 diffs)

branches/samba-3.5.x/source3/param/loadparm.c

@@ -5364 +5364 @@
 
 FN_GLOBAL_STRING(lp_smb_ports, &Globals.smb_ports)
-FN_GLOBAL_STRING(lp_dos_charset, &Globals.dos_charset)
-FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset)
-FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset)
+FN_GLOBAL_CONST_STRING(lp_dos_charset, &Globals.dos_charset)
+FN_GLOBAL_CONST_STRING(lp_unix_charset, &Globals.unix_charset)
+FN_GLOBAL_CONST_STRING(lp_display_charset, &Globals.display_charset)
 FN_GLOBAL_STRING(lp_logfile, &Globals.szLogFile)
 FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile)
@@ -9329 +9329 @@
         }
 
-        lp_add_auto_services(lp_auto_services());
+        {
+                char *serv = lp_auto_services();
+                lp_add_auto_services(serv);
+                TALLOC_FREE(serv);
+        }
 
         if (add_ipc) {