X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Flogin%2Fauthpam.py;h=0e6a83048617132226c729b7b5862c1b20e1357b;hp=1de8e0ff6a31afa473ee556db6b266df0508115c;hb=HEAD;hpb=45cb73a21a90084818c3057e362ef9459f1600f3

diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py
index 1de8e0f..0e6a830 100644
--- a/ipsilon/login/authpam.py
+++ b/ipsilon/login/authpam.py
@@ -1,21 +1,7 @@
-# Copyright (C) 2013  Simo Sorce <simo@redhat.com>
-#
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from ipsilon.login.common import LoginFormBase, LoginManagerBase
+# Copyright (C) 2013 Ipsilon project Contributors, for license see COPYING
+
+from ipsilon.login.common import LoginFormBase, LoginManagerBase, \
+    LoginManagerInstaller
 from ipsilon.util.plugin import PluginObject
 from ipsilon.util import config as pconfig
 import pam
@@ -26,9 +12,9 @@ class Pam(LoginFormBase):
 
     def _authenticate(self, username, password):
         if self.lm.service_name:
-            ok = pam.authenticate(username, password, self.lm.service_name)
+            ok = pam.pam().authenticate(username, password, self.lm.service_name)
         else:
-            ok = pam.authenticate(username, password)
+            ok = pam.pam().authenticate(username, password)
 
         if ok:
             self.log("User %s successfully authenticated." % username)
@@ -60,7 +46,7 @@ class Pam(LoginFormBase):
             error_password=not password,
             error_username=not username
         )
-        # pylint: disable=star-args
+        self.lm.set_auth_error()
         return self._template('login/form.html', **context)
 
 
@@ -79,7 +65,9 @@ for authentication. """
             pconfig.String(
                 'service name',
                 'The name of the PAM service used to authenticate.',
-                'remote'),
+                'remote',
+                readonly=True,
+                ),
             pconfig.String(
                 'username text',
                 'Text used to ask for the username at login time.',
@@ -115,11 +103,11 @@ for authentication. """
         return self.page
 
 
-class Installer(object):
+class Installer(LoginManagerInstaller):
 
     def __init__(self, *pargs):
+        super(Installer, self).__init__()
         self.name = 'pam'
-        self.ptype = 'login'
         self.pargs = pargs
 
     def install_args(self, group):
@@ -128,7 +116,7 @@ class Installer(object):
         group.add_argument('--pam-service', action='store', default='remote',
                            help='PAM service name to use for authentication')
 
-    def configure(self, opts):
+    def configure(self, opts, changes):
         if opts['pam'] != 'yes':
             return