diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-10-18 11:33:33 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-18 05:39:54 +0200 |
| commit | 5954a37997a786a8808ee2544b594a0c90f1c893 (patch) | |
| tree | 5e3749df18bb4249c218d1c40889300a29465770 /lib/param/loadparm.c | |
| parent | 9d49945ff037e46f5083dc88816acafc2343a77c (diff) | |
| download | samba-5954a37997a786a8808ee2544b594a0c90f1c893.tar.gz samba-5954a37997a786a8808ee2544b594a0c90f1c893.tar.bz2 samba-5954a37997a786a8808ee2544b594a0c90f1c893.zip | |
lib/param: Remove parameters for wins and spoolss databases
This removes the smb.conf parameters per-database, replacing these
with hard-coded database names in well known (and configurable)
directories.
The wins.ldb is now always in the "state dir", rather than being in
both state and lock dir (ie, a bug).
Less smb.conf parameters means less parameters to try and sync up
between the loadparm subsystems.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Oct 18 05:39:54 CEST 2011 on sn-devel-104
Diffstat (limited to 'lib/param/loadparm.c')
| -rw-r--r-- | lib/param/loadparm.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index e2dde453f8..0918cce236 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -376,30 +376,6 @@ static struct parm_struct parm_table[] = { .enum_list = NULL }, { - .label = "spoolss database", - .type = P_STRING, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szSPOOLSS_URL), - .special = NULL, - .enum_list = NULL - }, - { - .label = "wins config database", - .type = P_STRING, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szWINS_CONFIG_URL), - .special = NULL, - .enum_list = NULL - }, - { - .label = "wins database", - .type = P_STRING, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szWINS_URL), - .special = NULL, - .enum_list = NULL - }, - { .label = "private dir", .type = P_STRING, .p_class = P_GLOBAL, @@ -1493,9 +1469,6 @@ FN_GLOBAL_INTEGER(web_port, web_port) FN_GLOBAL_BOOL(tls_enabled, tls_enabled) FN_GLOBAL_STRING(logfile, logfile) FN_GLOBAL_STRING(share_backend, szShareBackend) -FN_GLOBAL_STRING(spoolss_url, szSPOOLSS_URL) -FN_GLOBAL_STRING(wins_config_url, szWINS_CONFIG_URL) -FN_GLOBAL_STRING(wins_url, szWINS_URL) FN_GLOBAL_CONST_STRING(winbind_separator, szWinbindSeparator) FN_GLOBAL_CONST_STRING(winbindd_socket_directory, szWinbinddSocketDirectory) FN_GLOBAL_CONST_STRING(winbindd_privileged_socket_directory, szWinbinddPrivilegedSocketDirectory) @@ -3331,9 +3304,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) /* the winbind method for domain controllers is for both RODC auth forwarding and for trusted domains */ lpcfg_do_global_parameter(lp_ctx, "private dir", dyn_PRIVATE_DIR); - lpcfg_do_global_parameter(lp_ctx, "spoolss database", "spoolss.ldb"); - lpcfg_do_global_parameter(lp_ctx, "wins config database", "wins_config.ldb"); - lpcfg_do_global_parameter(lp_ctx, "wins database", "wins.ldb"); lpcfg_do_global_parameter(lp_ctx, "registry:HKEY_LOCAL_MACHINE", "hklm.ldb"); /* This hive should be dynamically generated by Samba using |