Implement change registration

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

diff --git a/ipsilon/login/authform.py b/ipsilon/login/authform.py
index ecce919..eed35fc 100644 (file)
--- a/ipsilon/login/authform.py
+++ b/ipsilon/login/authform.py
@@ -1,19 +1,4 @@
-# Copyright (C) 2014  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/>.
+# Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING
 
 from ipsilon.login.common import LoginFormBase, LoginManagerBase, \
     LoginManagerInstaller
@@ -23,7 +8,6 @@ from ipsilon.util import config as pconfig
 from string import Template
 import cherrypy
 import subprocess
-import logging
 
 
 class Form(LoginFormBase):
@@ -39,7 +23,7 @@ class Form(LoginFormBase):
                 error = cherrypy.request.headers['EXTERNAL_AUTH_ERROR']
             except KeyError:
                 error = "Unknown error using external authentication"
-                cherrypy.log.error("Error: %s" % error, logging.ERROR)
+                cherrypy.log.error("Error: %s" % error)
             return self.lm.auth_failed(self.trans)
 
 
@@ -115,7 +99,7 @@ class Installer(LoginManagerInstaller):
         group.add_argument('--form-service', action='store', default='remote',
                            help='PAM service name to use for authentication')
 
-    def configure(self, opts):
+    def configure(self, opts, changes):
         if opts['form'] != 'yes':
             return
 
@@ -123,7 +107,7 @@ class Installer(LoginManagerInstaller):
                     'service': opts['form_service']}
 
         tmpl = Template(CONF_TEMPLATE)
-        hunk = tmpl.substitute(**confopts)  # pylint: disable=star-args
+        hunk = tmpl.substitute(**confopts)
         with open(opts['httpd_conf'], 'a') as httpd_conf:
             httpd_conf.write(hunk)