Add proper ordering to login plugins config opts

[cascardo/ipsilon.git] / ipsilon / login / authpam.py

diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py
index c88f0a0..f322e14 100755 (executable)
--- a/ipsilon/login/authpam.py
+++ b/ipsilon/login/authpam.py
@@ -49,7 +49,7 @@ class Pam(LoginFormBase):
         if username and password:
             user = self._authenticate(username, password)
             if user:
         if username and password:
             user = self._authenticate(username, password)
             if user:

-                return self.lm.auth_successful(user)
+                return self.lm.auth_successful(user, 'password')

             else:
                 error = "Authentication failed"
                 cherrypy.log.error(error)
             else:
                 error = "Authentication failed"
                 cherrypy.log.error(error)


@@ -99,6 +99,8 @@ for authentication. """
                 'Password'
             ],
         }
                 'Password'
             ],
         }

+        self.conf_opt_order = ['service name', 'username text',
+                               'password text', 'help text']

 
     @property
     def service_name(self):
 
     @property
     def service_name(self):