From 93ef0899c015e189022650c807c473eef21d040e Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Jan 05 2016 15:34:55 +0000
Subject: Fix concerns about shadowing APIs


Fixes: #67
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
Reviewed-by: John Dennis <jdennis@redhat.com>

---

diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py
index 9e0358b..f7ae6c1 100644
--- a/ipsilon/login/authpam.py
+++ b/ipsilon/login/authpam.py
@@ -6,8 +6,14 @@ from ipsilon.util.plugin import PluginObject
 from ipsilon.util import config as pconfig
 import pam
 if 'pam' in dir(pam):
-    # Try to use newer API, but also support older python-pam API
-    pam = pam.pam()  # pylint: disable=no-member
+    # Try to use newer API
+    pam_authenticate = pam.pam().authenticate  # pylint: disable=no-member
+elif 'authenticate' in dir(pam):
+    # This is an older, but supported, version
+    pam_authenticate = pam.authenticate
+else:
+    # We have never seen this version, let's abort early
+    raise ImportError('Python-PAM API unsupported')
 import subprocess
 
 
@@ -15,9 +21,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_authenticate(username, password, self.lm.service_name)
         else:
-            ok = pam.authenticate(username, password)
+            ok = pam_authenticate(username, password)
 
         if ok:
             self.log("User %s successfully authenticated." % username)