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, 1 insertions, 99 deletions

diff --git a/kickstart.py b/kickstart.py
index 569efeddb..fe63fcc0b 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -238,105 +238,7 @@ class Kickstart(BaseInstallClass):
         self.skipSteps.append("zfcpconfig")
                 
     def doAuthconfig(self, id, args):
-	(args, extra) = isys.getopt(args, '',
-                [ 'useshadow', 'enableshadow',
-		  'enablemd5',
-                  'enablenis', 'nisdomain=', 'nisserver=',
-                  'enableldap', 'enableldapauth', 'ldapserver=', 'ldapbasedn=',
-                  'enableldaptls', 
-                  'enablekrb5', 'krb5realm=', 'krb5kdc=', 'krb5adminserver=',
-                  'enablehesiod', 'hesiodlhs=', 'hesiodrhs=',
-                  'enablesmbauth', 'smbservers=', 'smbworkgroup=',
-                  'enablecache'])
-
-	useShadow = 0
-
-	useMd5 = 0
-
-	useNis = 0
-	nisServer = ""
-	nisDomain = ""
-	nisBroadcast = 0
-
-        useLdap = 0
-        useLdapauth = 0
-        useLdaptls = 0
-        ldapServer = ""
-        ldapBasedn = ""
-
-        useKrb5 = 0
-        krb5Realm = ""
-        krb5Kdc = ""
-        krb5Admin = ""
-
-        useHesiod = 0
-        hesiodLhs = ""
-        hesiodRhs = ""
-
-        useSamba = 0
-        smbServers = ""
-        smbWorkgroup = ""
-
-        enableCache = 0
-	
-	for n in args:
-	    (str, arg) = n
-	    if (str == '--enablenis'):
-		useNis = 1
-	    elif (str == '--useshadow') or (str == '--enableshadow'):
-		useShadow = 1
-	    elif (str == '--enablemd5'):
-		useMd5 = 1
-	    elif (str == '--nisserver'):
-		nisServer = arg
-	    elif (str == '--nisdomain'):
-		nisDomain = arg
-            elif (str == '--enableldap'):
-                useLdap = 1
-            elif (str == '--enableldapauth'):
-                useLdapauth = 1
-            elif (str == '--ldapserver'):
-                ldapServer = arg
-            elif (str == '--ldapbasedn'):
-                ldapBasedn = arg
-            elif (str == '--enableldaptls'):
-                useLdaptls = 1
-            elif (str == '--enablekrb5'):
-                useKrb5 = 1
-            elif (str == '--krb5realm'):
-                krb5Realm = arg
-            elif (str == '--krb5kdc'):
-                krb5Kdc = arg
-            elif (str == '--krb5adminserver'):
-                krb5Admin = arg
-            elif (str == '--enablehesiod'):
-                useHesiod = 1
-            elif (str == '--hesiodlhs'):
-                hesiodLhs = arg
-            elif (str == '--hesiodrhs'):
-                hesiodRhs = arg
-            elif (str == '--enablesmbauth'):
-                useSamba = 1
-            elif (str == '--smbservers'):
-                smbServers = arg
-            elif (str == '--smbworkgroup'):
-                smbWorkgroup = arg
-            elif (str == '--enablecache'):
-                enableCache = 1
-                
-
-	if useNis and not nisServer: nisBroadcast = 1
-	    
-	self.setAuthentication(id, useShadow, useMd5,
-                               useNis, nisDomain, nisBroadcast, nisServer,
-                               useLdap, useLdapauth, ldapServer,
-                               ldapBasedn, useLdaptls,
-                               useKrb5, krb5Realm, krb5Kdc, krb5Admin,
-                               useHesiod, hesiodLhs, hesiodRhs,
-                               useSamba, smbServers, smbWorkgroup,
-                               enableCache)
-        
-	self.skipSteps.append("authentication")
+	self.setAuthentication(id, string.join(args))
 
     def doBootloader (self, id, args):
         (args, extra) = isys.getopt(args, '',