diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-07-03 08:05:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:59:00 -0500 |
| commit | 222c6dd7818c729540079cc480ee56812681854e (patch) | |
| tree | c8c92312f69ae1c97ad51d2a66e524d3e41cc165 /source4/param | |
| parent | 2f269ed95463535b701851735a9b2d43d6b955c1 (diff) | |
| download | samba-222c6dd7818c729540079cc480ee56812681854e.tar.gz samba-222c6dd7818c729540079cc480ee56812681854e.tar.bz2 samba-222c6dd7818c729540079cc480ee56812681854e.zip | |
r23680: Make it easier to setup a domain member server - the 'server role'
will now control the auth methods, but an override is still available,
ex:
auth methods:domain controller = <methods>
Andrew Bartlett
(This used to be commit b7e727186ed8eda6a68c873e089f655dc24fe8ae)
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 9bcf9aada7..8371b94a50 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -398,7 +398,6 @@ static struct parm_struct parm_table[] = { {"Security Options", P_SEP, P_SEPARATOR}, {"security", P_ENUM, P_GLOBAL, &Globals.security, NULL, enum_security, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER}, - {"auth methods", P_LIST, P_GLOBAL, &Globals.AuthMethods, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER}, {"encrypt passwords", P_BOOL, P_GLOBAL, &Globals.bEncryptPasswords, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER}, {"null passwords", P_BOOL, P_GLOBAL, &Globals.bNullPasswords, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"obey pam restrictions", P_BOOL, P_GLOBAL, &Globals.bObeyPamRestrictions, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, @@ -609,7 +608,9 @@ static void init_globals(void) do_parameter("dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg dssetup unixinfo", NULL); do_parameter("server services", "smb rpc nbt wrepl ldap cldap web kdc drepl winbind", NULL); do_parameter("ntptr providor", "simple_ldb", NULL); - do_parameter("auth methods", "anonymous sam_ignoredomain", NULL); + do_parameter("auth methods:domain controller", "anonymous sam_ignoredomain", NULL); + do_parameter("auth methods:member server", "anonymous sam winbind", NULL); + do_parameter("auth methods:standalone", "anonymous sam_ignoredomain", NULL); do_parameter("private dir", dyn_PRIVATE_DIR, NULL); do_parameter("sam database", "sam.ldb", NULL); do_parameter("secrets database", "secrets.ldb", NULL); |