[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-6-g3100119

Volker Lendecke vlendec at samba.org
Fri Mar 14 17:04:38 GMT 2008


The branch, v3-0-test has been updated
       via  3100119b97064135b4c696227349dd174d5663bf (commit)
      from  34500b412bf4c67c28d005a3395ea4f4a26622f6 (commit)

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


- Log -----------------------------------------------------------------
commit 3100119b97064135b4c696227349dd174d5663bf
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Mar 14 18:01:06 2008 +0100

    Fix bug 4901
    
    Thanks to Laurent Pinchart for bugging me

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

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


Changeset truncated at 500 lines:

diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index 8c6fa81..e1f57a8 100644
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -1795,8 +1795,9 @@ static NTSTATUS ldapsam_update_sam_account(struct pdb_methods *my_methods, struc
 			ldap_mods_free(mods,True);
 		return NT_STATUS_UNSUCCESSFUL;
 	}
-	
-	if (mods == NULL) {
+
+	if ((lp_ldap_passwd_sync() != LDAP_PASSWD_SYNC_ONLY)
+	    && (mods == NULL)) {
 		DEBUG(4,("ldapsam_update_sam_account: mods is empty: nothing to update for user: %s\n",
 			 pdb_get_username(newpwd)));
 		SAFE_FREE(dn);
@@ -1804,7 +1805,11 @@ static NTSTATUS ldapsam_update_sam_account(struct pdb_methods *my_methods, struc
 	}
 	
 	ret = ldapsam_modify_entry(my_methods,newpwd,dn,mods,LDAP_MOD_REPLACE, element_is_changed);
-	ldap_mods_free(mods,True);
+
+	if (mods != NULL) {
+		ldap_mods_free(mods,True);
+	}
+
 	SAFE_FREE(dn);
 
 	/*


-- 
Samba Shared Repository


More information about the samba-cvs mailing list