[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1009-g9369d6e

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  9369d6e907a49da1fbf2a5690118412b8d1a0383 (commit)
      from  a4d613cde86caf5782c4bfc47122d6ba807990ac (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 9369d6e907a49da1fbf2a5690118412b8d1a0383
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 2 18:20:23 2008 -0800

    Fix for bug #5163 from Laurent Pinchart <pinchart at skynet.be>
    Failure to change password in ldap is mapped to NT_STATUS_UNSUCCESSFUL unconditionally.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/passdb/pdb_ldap.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index b638219..205b178 100644
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -1768,6 +1768,10 @@ static NTSTATUS ldapsam_modify_entry(struct pdb_methods *my_methods,
 				pdb_get_username(newpwd), ldap_err2string(rc), ld_error?ld_error:"unknown"));
 			SAFE_FREE(ld_error);
 			ber_bvfree(bv);
+#if defined(LDAP_CONSTRAINT_VIOLATION)
+			if (rc == LDAP_CONSTRAINT_VIOLATION)
+				return NT_STATUS_PASSWORD_RESTRICTION;
+#endif
 			return NT_STATUS_UNSUCCESSFUL;
 		} else {
 			DEBUG(3,("ldapsam_modify_entry: LDAP Password changed for user %s\n",pdb_get_username(newpwd)));


-- 
Samba Shared Repository