[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28-76-geeed0c1

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  eeed0c16f0d6a8afb0096dae6501826ec422b56a (commit)
      from  c7bf932a80676457e1a9982c5e05157746c5545d (commit)

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


- Log -----------------------------------------------------------------
commit eeed0c16f0d6a8afb0096dae6501826ec422b56a
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 2 18:20:25 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 afcb463..8d7caba 100644
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -1651,6 +1651,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