X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Flogin%2Fauthgssapi.py;h=a05644dbdf36bdba641a5486b67e8a47fcb8e4b3;hp=97c3834f09cf7a3d5d2a004e3082b2b5977c09ed;hb=485baf6ee7a315d1af1086fe5b5da8cff6c4ba37;hpb=68b9e1d3138784c3793f0a04c411f14168748692

diff --git a/ipsilon/login/authgssapi.py b/ipsilon/login/authgssapi.py
index 97c3834..a05644d 100644
--- a/ipsilon/login/authgssapi.py
+++ b/ipsilon/login/authgssapi.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 LoginPageBase, LoginManagerBase, \
     LoginManagerInstaller
@@ -22,6 +7,7 @@ from ipsilon.util.user import UserSession
 from string import Template
 import cherrypy
 import os
+import logging
 
 
 class GSSAPI(LoginPageBase):
@@ -56,7 +42,8 @@ class GSSAPIAuth(LoginPageBase):
 class GSSAPIError(LoginPageBase):
 
     def root(self, *args, **kwargs):
-        cherrypy.log.error('REQUEST: %s' % cherrypy.request.headers)
+        cherrypy.log.error('REQUEST: %s' % cherrypy.request.headers,
+                           severity=logging.DEBUG)
         # If we have no negotiate header return whatever mod_auth_gssapi
         # generated and wait for the next request
 
@@ -127,7 +114,7 @@ class Installer(LoginManagerInstaller):
                            default='/etc/httpd/conf/http.keytab',
                            help='Kerberos keytab location for HTTPD')
 
-    def configure(self, opts):
+    def configure(self, opts, changes):
         if opts['gssapi'] != 'yes':
             return
 
@@ -145,7 +132,7 @@ class Installer(LoginManagerInstaller):
             confopts['gssapisslonly'] = 'On'
 
         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)