From f3b540ab73daa8ac88002e1f6f32101eff85e3fd Mon Sep 17 00:00:00 2001
From: Arthur de Jong <arthur@arthurdejong.org>
Date: Wed, 28 Dec 2011 22:29:49 +0000
Subject: fall back to trying to authenticate with provided password (in case
 rootpwmodpw is not set or unusable)

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1579 ef36b2f9-881f-0410-afb5-c4e39611909c
---
 pynslcd/pam.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'pynslcd')

diff --git a/pynslcd/pam.py b/pynslcd/pam.py
index 7b39f67..8bbbe48 100644
--- a/pynslcd/pam.py
+++ b/pynslcd/pam.py
@@ -101,6 +101,10 @@ class PAMAuthenticationRequest(PAMRequest):
             # if the caller is root we will allow the use of rootpwmodpw
             if not parameters['password'] and self.calleruid == 0 and cfg.rootpwmodpw:
                 password = cfg.rootpwmodpw
+            elif parameters['password']:
+                password = parameters['password']
+            else:
+                raise ValueError('password missing')
         else:
             self.validate_request(parameters)
             userdn = parameters['userdn']
-- 
cgit v1.2.3