diff options
| author | Michael Adam <obnox@samba.org> | 2008-05-15 02:25:34 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-05-15 02:42:41 +0200 |
| commit | 0ba819dd21f8676385b05702d88066c86a4578ee (patch) | |
| tree | 182fa54d2fb501ad2193e0900383afe5d887b075 /source3/param | |
| parent | 86766b522018973e1c5e37b45e8b5b01dbcbd202 (diff) | |
| download | samba-0ba819dd21f8676385b05702d88066c86a4578ee.tar.gz samba-0ba819dd21f8676385b05702d88066c86a4578ee.tar.bz2 samba-0ba819dd21f8676385b05702d88066c86a4578ee.zip | |
loadparm: add parameter allow_registry_shares to lp_load_ex().
This allows for registry shares to be activated, i.e. loaded into
the services array at lp_load() time.
Michael
(This used to be commit b3233ecefd5df745ba7e10511f9ab36064036b10)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 9eee1691a8..0d116f8790 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -8719,7 +8719,8 @@ bool lp_load_ex(const char *pszFname, bool save_defaults, bool add_ipc, bool initialize_globals, - bool allow_include_registry) + bool allow_include_registry, + bool allow_registry_shares) { char *n2 = NULL; bool bRetval; @@ -8793,7 +8794,8 @@ bool lp_load_ex(const char *pszFname, lp_kill_all_services(); return lp_load_ex(pszFname, global_only, save_defaults, add_ipc, initialize_globals, - allow_include_registry); + allow_include_registry, + allow_registry_shares); } } else if (lp_config_backend_is_registry()) { bRetval = process_registry_globals(); @@ -8803,6 +8805,10 @@ bool lp_load_ex(const char *pszFname, bRetval = false; } + if (bRetval && lp_registry_shares() && allow_registry_shares) { + bRetval = process_registry_shares(); + } + lp_add_auto_services(lp_auto_services()); if (add_ipc) { @@ -8844,7 +8850,7 @@ bool lp_load(const char *pszFname, save_defaults, add_ipc, initialize_globals, - true); + true, false); } bool lp_load_initial_only(const char *pszFname) @@ -8854,6 +8860,7 @@ bool lp_load_initial_only(const char *pszFname) false, false, true, + false, false); } |