summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornalin <nalin>2001-09-10 16:05:04 +0000
committernalin <nalin>2001-09-10 16:05:04 +0000
commit1a296bf72a24610a881640fcf584398fe8c7a4a0 (patch)
treecd46099012feb76dde80743fdff868edbc4cb9c6
parent6a16b6326b5751ab529a0d5f3d80e19280bd8506 (diff)
downloadanaconda-1a296bf72a24610a881640fcf584398fe8c7a4a0.tar.gz
anaconda-1a296bf72a24610a881640fcf584398fe8c7a4a0.tar.xz
anaconda-1a296bf72a24610a881640fcf584398fe8c7a4a0.zip
disable things which are not explicitly enabled for authconfig (should fix reconfig mode)
-rw-r--r--users.py18
1 files changed, 18 insertions, 0 deletions
diff --git a/users.py b/users.py
index eb47da79e..c33e0ec4f 100644
--- a/users.py
+++ b/users.py
@@ -169,12 +169,18 @@ class Authentication:
if self.useShadow:
args.append ("--enableshadow")
+ else:
+ args.append ("--disableshadow")
if self.useMD5:
args.append ("--enablemd5")
+ else:
+ args.append ("--disablemd5")
if self.enableCache:
args.append("--enablecache")
+ else:
+ args.append("--disablecache")
if self.useNIS:
args.append ("--enablenis")
@@ -188,8 +194,12 @@ class Authentication:
if self.useLdap:
args.append ("--enableldap")
+ else:
+ args.append ("--disableldap")
if self.useLdapauth:
args.append ("--enableldapauth")
+ else:
+ args.append ("--disableldapauth")
if self.useLdap or self.useLdapauth:
args.append ("--ldapserver")
args.append (self.ldapServer)
@@ -197,6 +207,8 @@ class Authentication:
args.append (self.ldapBasedn)
if self.ldapTLS:
args.append ("--enableldaptls")
+ else:
+ args.append ("--disableldaptls")
if self.useKrb5:
args.append ("--enablekrb5")
@@ -206,6 +218,8 @@ class Authentication:
args.append (self.krb5Kdc)
args.append ("--krb5adminserver")
args.append (self.krb5Admin)
+ else:
+ args.append("--disablekrb5")
if self.useHesiod:
args.append ("--enablehesiod")
@@ -213,6 +227,8 @@ class Authentication:
args.append (self.hesiodLhs)
args.append ("--hesiodrhs")
args.append (self.hesiodRhs)
+ else:
+ args.append("--disablehesiod")
if self.useSamba:
args.append ("--enablesmbauth")
@@ -220,6 +236,8 @@ class Authentication:
args.append (self.sambaServer)
args.append ("--smbworkgroup")
args.append (self.sambaWorkgroup)
+ else:
+ args.append("--disablesmbauth")
return args