svn commit: samba r4444 - in branches/SAMBA_4_0/source/param: .
tridge at samba.org
tridge at samba.org
Fri Dec 31 08:43:34 GMT 2004
Author: tridge
Date: 2004-12-31 08:43:34 +0000 (Fri, 31 Dec 2004)
New Revision: 4444
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4444
Log:
- initialise registry:HKEY_LOCAL_MACHINE to a reasonable default (where
provision.pl suggests hklm.ldb be put)
- fix the globals init not to wipe parametic values after initialising
them (this bug prevented default values for parametric parameters)
Modified:
branches/SAMBA_4_0/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c 2004-12-31 07:53:42 UTC (rev 4443)
+++ branches/SAMBA_4_0/source/param/loadparm.c 2004-12-31 08:43:34 UTC (rev 4444)
@@ -933,6 +933,7 @@
do_parameter("private dir", dyn_PRIVATE_DIR);
do_parameter_var("sam database", "tdb://%s/sam.ldb", dyn_PRIVATE_DIR);
do_parameter_var("spoolss database", "tdb://%s/spoolss.ldb", dyn_PRIVATE_DIR);
+ do_parameter_var("registry:HKEY_LOCAL_MACHINE", "ldb:/%s/hklm.ldb", dyn_PRIVATE_DIR);
do_parameter("guest account", GUEST_ACCOUNT);
/* using UTF8 by default allows us to support all chars */
@@ -1412,7 +1413,7 @@
const char *lp_parm_string(int lookup_service, const char *type, const char *option)
{
const char *value = get_parametrics(lookup_service, type, option);
-
+
if (value)
return lp_string(value);
@@ -3025,13 +3026,6 @@
bInGlobalSection = True;
bGlobalOnly = global_only;
- init_globals();
-
- if (save_defaults)
- {
- lp_save_defaults();
- }
-
if (Globals.param_opt != NULL) {
struct param_opt *next;
for (data=Globals.param_opt; data; data=next) {
@@ -3044,6 +3038,13 @@
}
}
+ init_globals();
+
+ if (save_defaults)
+ {
+ lp_save_defaults();
+ }
+
/* We get sections first, so have to start 'behind' to make up */
iServiceIndex = -1;
bRetval = pm_process(n2, do_section, do_parameter);
More information about the samba-cvs
mailing list