Simplified the authconfig step to store data as a string to be passed to

authconfig in its entirety, rather than handling it as a series of
arguments we need to process.  We weren't really doing anything with it
anyway.

1 files changed, 10 insertions, 141 deletions

diff --git a/users.py b/users.py
index 26f572dbe..4993e683f 100644
--- a/users.py
+++ b/users.py
@@ -38,16 +38,16 @@ class Accounts:
     def getUserList(self):
 	return self.users
 
-    def writeKScommands(self, f, auth):
+    def writeKScommands(self, f, useMD5):
 	for (account, name, password) in self.users:
-	    crypted = cryptPassword(password, auth.useMD5)
+	    crypted = cryptPassword(password, useMD5)
 
 	    f.write("/usr/sbin/useradd %s\n" % (account));
 	    f.write("chfn -f '%s' %s\n" % (name, account))
 	    f.write("/usr/sbin/usermod -p '%s' %s\n" % (crypted, account))
 	    f.write("\n")
 
-    def write(self, instPath, auth):
+    def write(self, instPath, useMD5):
 	if not self.users: return
 
         if not flags.setupFilesystems:
@@ -62,7 +62,7 @@ class Accounts:
 	    iutil.execWithRedirect(argv[0], argv, root = instPath,
 				   stdout = None)
 	
-	    setPassword(instPath, account, password, auth.useMD5)
+	    setPassword(instPath, account, password, useMD5)
 
     def __init__(self):
 	self.users = []
@@ -97,18 +97,18 @@ class RootPassword(Password):
     def __str__(self):
 	return "<Type RootPassword>"
 
-    def write(self, instPath, auth):
+    def write(self, instPath, useMD5):
 	pure = self.getPure()
 	if pure:
-	    setPassword(instPath, "root", pure, auth.useMD5)
+	    setPassword(instPath, "root", pure, useMD5)
 	else:
-	    setPassword(instPath, "root", self.getCrypted (),
-                        auth.useMD5, alreadyCrypted = 1)
+	    setPassword(instPath, "root", self.getCrypted (), useMD5,
+			alreadyCrypted = 1)
 
-    def writeKS(self, f, auth):
+    def writeKS(self, f, useMD5):
         pure = self.getPure()
         if pure:
-            f.write("rootpw --iscrypted %s\n" %(cryptPassword(pure, auth.useMD5)))
+            f.write("rootpw --iscrypted %s\n" %(cryptPassword(pure, useMD5)))
         else:
             f.write("rootpw --iscrypted %s\n" %(self.getCrypted()))
 
@@ -136,134 +136,3 @@ def setPassword(instPath, account, password, useMD5, alreadyCrypted = 0):
     iutil.execWithRedirect(argv[0], argv, root = instPath, 
 			   stdout = '/dev/null', stderr = None)
     os.close(devnull)
-
-class Authentication:
-    def __init__ (self):
-        self.useShadow = 1
-        self.useMD5 = 1
-
-        self.useNIS = 0
-        self.nisDomain = ""
-        self.nisuseBroadcast = 1
-        self.nisServer = ""
-
-        self.useLdap = 0
-        self.useLdapauth = 0
-        self.ldapServer = ""
-        self.ldapBasedn = ""
-        self.ldapTLS = ""
-
-        self.useKrb5 = 0
-        self.krb5Realm = ""
-        self.krb5Kdc = ""
-        self.krb5Admin = ""
-
-        self.useHesiod = 0
-        self.hesiodLhs = ""
-        self.hesiodRhs = ""
-
-        self.useSamba = 0
-        self.sambaServer = ""
-        self.sambaWorkgroup = ""
-
-        self.enableCache = 0
-
-    def writeKS(self, f):
-	f.write("authconfig")
-	for arg in self.getArgList():
-	    if arg[0:9] != "--disable":
-		f.write(" " + arg)
-	f.write("\n")
-
-    def getArgList(self):
-	args = []
-
-        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")
-            args.append ("--nisdomain")
-            args.append (self.nisDomain)
-            if not self.nisuseBroadcast:
-                args.append ("--nisserver")
-                args.append (self.nisServer)
-        else:
-            args.append ("--disablenis")
-
-        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)
-            args.append ("--ldapbasedn")
-            args.append (self.ldapBasedn)
-        if self.ldapTLS:
-            args.append ("--enableldaptls")
-        else:
-            args.append ("--disableldaptls")
-
-        if self.useKrb5:
-            args.append ("--enablekrb5")
-            args.append ("--krb5realm")
-            args.append (self.krb5Realm)
-            args.append ("--krb5kdc")
-            args.append (self.krb5Kdc)
-            args.append ("--krb5adminserver")
-            args.append (self.krb5Admin)
-        else:
-	    args.append("--disablekrb5")
-
-        if self.useHesiod:
-            args.append ("--enablehesiod")
-            args.append ("--hesiodlhs")
-            args.append (self.hesiodLhs)
-            args.append ("--hesiodrhs")
-            args.append (self.hesiodRhs)
-        else:
-	    args.append("--disablehesiod")
-
-        if self.useSamba:
-            args.append ("--enablesmbauth")
-            args.append ("--smbservers")
-            args.append (self.sambaServer)
-            args.append ("--smbworkgroup")
-            args.append (self.sambaWorkgroup)
-        else:
-	    args.append("--disablesmbauth")
-
-	return args
- 
-    def write (self, instPath):
-        args = [ "/usr/sbin/authconfig", "--kickstart", "--nostart" ]
-	args = args + self.getArgList()
-
-        try:
-            if flags.setupFilesystems:
-                iutil.execWithRedirect(args[0], args,
-                                       stdout = None, stderr = None,
-                                       searchPath = 1,
-                                       root = instPath)
-            else:
-                log.error("Would have run %s", args)
-        except RuntimeError, msg:
-            log.error("Error running %s: %s", args, msg)
-