diff options
| author | Volker Lendecke <vl@samba.org> | 2008-07-13 12:07:40 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-08-12 11:28:29 +0200 |
| commit | 340ab6a256802a22c11b7f707748397249075b65 (patch) | |
| tree | 20d297829eb3e27c6c80ad537712627ae845a4ef /source3/param | |
| parent | 8d4bd2d960ebf11bc85891210c6f72a371e08417 (diff) | |
| download | samba-340ab6a256802a22c11b7f707748397249075b65.tar.gz samba-340ab6a256802a22c11b7f707748397249075b65.tar.bz2 samba-340ab6a256802a22c11b7f707748397249075b65.zip | |
idmap rewrite
(This used to be commit 30a180f2fce8cf6a3e5548f6bba453272ba70b33)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 7882b37c2c..7fd7bb2bf4 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -194,8 +194,7 @@ struct global { bool bWinbindOfflineLogon; bool bWinbindNormalizeNames; bool bWinbindRpcOnly; - char **szIdmapDomains; - char **szIdmapBackend; /* deprecated */ + char *szIdmapBackend; char *szIdmapAllocBackend; char *szAddShareCommand; char *szChangeShareCommand; @@ -4256,17 +4255,8 @@ static struct parm_struct parm_table[] = { .flags = FLAG_ADVANCED, }, { - .label = "idmap domains", - .type = P_LIST, - .p_class = P_GLOBAL, - .ptr = &Globals.szIdmapDomains, - .special = NULL, - .enum_list = NULL, - .flags = FLAG_ADVANCED, - }, - { .label = "idmap backend", - .type = P_LIST, + .type = P_STRING, .p_class = P_GLOBAL, .ptr = &Globals.szIdmapBackend, .special = NULL, @@ -4825,6 +4815,7 @@ static void init_globals(bool first_time_only) Globals.bKernelOplocks = True; Globals.bAllowTrustedDomains = True; + string_set(&Globals.szIdmapBackend, "tdb"); string_set(&Globals.szTemplateShell, "/bin/false"); string_set(&Globals.szTemplateHomedir, "/home/%D/%U"); @@ -5091,8 +5082,7 @@ FN_GLOBAL_BOOL(lp_winbind_offline_logon, &Globals.bWinbindOfflineLogon) FN_GLOBAL_BOOL(lp_winbind_normalize_names, &Globals.bWinbindNormalizeNames) FN_GLOBAL_BOOL(lp_winbind_rpc_only, &Globals.bWinbindRpcOnly) -FN_GLOBAL_LIST(lp_idmap_domains, &Globals.szIdmapDomains) -FN_GLOBAL_LIST(lp_idmap_backend, &Globals.szIdmapBackend) /* deprecated */ +FN_GLOBAL_CONST_STRING(lp_idmap_backend, &Globals.szIdmapBackend) /* deprecated */ FN_GLOBAL_STRING(lp_idmap_alloc_backend, &Globals.szIdmapAllocBackend) FN_GLOBAL_INTEGER(lp_idmap_cache_time, &Globals.iIdmapCacheTime) FN_GLOBAL_INTEGER(lp_idmap_negative_cache_time, &Globals.iIdmapNegativeCacheTime) |