diff options
| author | Volker Lendecke <vlendec@samba.org> | 2005-12-01 14:46:56 +0000 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2005-12-01 14:46:56 +0000 |
| commit | 6bb9f48b28e03ad1710d784b3300007803c4a6b6 (patch) | |
| tree | 82f19a5aeae823abb354630305e9f6d03c3cc819 /source/param | |
| parent | 038c39804739ec1a4d7131bdadae4d5c5c378088 (diff) | |
| download | samba-6bb9f48b28e03ad1710d784b3300007803c4a6b6.tar.gz samba-6bb9f48b28e03ad1710d784b3300007803c4a6b6.tar.xz samba-6bb9f48b28e03ad1710d784b3300007803c4a6b6.zip | |
r11999: Re-add "passdb expand explicit".
We came to the conclusion that changing the default is something that has to
wait one or two more releases, but it will happen one way or the other.
Volker
Diffstat (limited to 'source/param')
| -rw-r--r-- | source/param/loadparm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/param/loadparm.c b/source/param/loadparm.c index 86a5353dca7..cdef0340618 100644 --- a/source/param/loadparm.c +++ b/source/param/loadparm.c @@ -168,6 +168,7 @@ typedef struct char *szIdmapUID; char *szIdmapGID; BOOL bEnableRidAlgorithm; + BOOL bPassdbExpandExplicit; int AlgorithmicRidBase; char *szTemplateHomedir; char *szTemplateShell; @@ -1240,6 +1241,7 @@ static struct parm_struct parm_table[] = { {N_("Winbind options"), P_SEP, P_SEPARATOR}, {"enable rid algorithm", P_BOOL, P_GLOBAL, &Globals.bEnableRidAlgorithm, NULL, NULL, FLAG_DEPRECATED}, + {"passdb expand explicit", P_BOOL, P_GLOBAL, &Globals.bPassdbExpandExplicit, NULL, NULL, FLAG_ADVANCED}, {"idmap backend", P_LIST, P_GLOBAL, &Globals.szIdmapBackend, NULL, NULL, FLAG_ADVANCED}, {"idmap uid", P_STRING, P_GLOBAL, &Globals.szIdmapUID, handle_idmap_uid, NULL, FLAG_ADVANCED}, {"winbind uid", P_STRING, P_GLOBAL, &Globals.szIdmapUID, handle_idmap_uid, NULL, FLAG_HIDE}, @@ -1603,6 +1605,7 @@ static void init_globals(void) Globals.szWinbindNssInfo = str_list_make("template", NULL); Globals.bEnableRidAlgorithm = True; + Globals.bPassdbExpandExplicit = True; Globals.name_cache_timeout = 660; /* In seconds */ @@ -1792,6 +1795,7 @@ FN_GLOBAL_BOOL(lp_winbind_nested_groups, &Globals.bWinbindNestedGroups) FN_GLOBAL_LIST(lp_idmap_backend, &Globals.szIdmapBackend) FN_GLOBAL_BOOL(lp_enable_rid_algorithm, &Globals.bEnableRidAlgorithm) +FN_GLOBAL_BOOL(lp_passdb_expand_explicit, &Globals.bPassdbExpandExplicit) #ifdef WITH_LDAP_SAMCONFIG FN_GLOBAL_STRING(lp_ldap_server, &Globals.szLdapServer) |