[Pkg-openldap-devel] [openldap] 185/281: ITS#8080 nssov: allow user pwmod without pwdmgr configured

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit a01fd59acc3331b8c9bec03f1bfeeca3aaaabd1f
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Mon Mar 16 04:53:32 2015 +0000

    ITS#8080 nssov: allow user pwmod without pwdmgr configured
---
 contrib/slapd-modules/nssov/pam.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/contrib/slapd-modules/nssov/pam.c b/contrib/slapd-modules/nssov/pam.c
index a455331..25ed22a 100644
--- a/contrib/slapd-modules/nssov/pam.c
+++ b/contrib/slapd-modules/nssov/pam.c
@@ -770,13 +770,8 @@ int pam_pwmod(nssov_info *ni,TFILE *fp,Operation *op,uid_t calleruid)
 		goto done;
 	}
 
-	if (BER_BVISEMPTY(&ni->ni_pam_pwdmgr_dn)) {
-		Debug(LDAP_DEBUG_TRACE,"nssov_pam_pwmod(), %s\n",
-			"pwdmgr not configured", 0, 0);
-		ber_str2bv("pwdmgr not configured", 0, 0, &pi.msg);
-		rc = NSLCD_PAM_PERM_DENIED;
-		goto done;
-	} else if (!ber_bvcmp(&pi.dn, &ni->ni_pam_pwdmgr_dn)) {
+	if (!BER_BVISEMPTY(&ni->ni_pam_pwdmgr_dn) &&
+		!ber_bvcmp(&pi.dn, &ni->ni_pam_pwdmgr_dn)) {
 		if (calleruid != 0) {
 			Debug(LDAP_DEBUG_TRACE,"nssov_pam_pwmod(): %s\n",
 				"caller is not root", 0, 0);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git