[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-244-g1dd8fa9
Volker Lendecke
vlendec at samba.org
Fri Mar 14 17:02:18 GMT 2008
The branch, v3-2-test has been updated
via 1dd8fa9a521046f1de8173ac00224706c5249665 (commit)
from 2546da817f666914c1c220ec1fedc19aa41b25ad (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 1dd8fa9a521046f1de8173ac00224706c5249665
Author: Volker Lendecke <vl at samba.org>
Date: Fri Mar 14 18:01:06 2008 +0100
Fix bug 4901
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 1 +
source/passdb/pdb_ldap.c | 11 ++++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 3928e6d..a9ca352 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -305,6 +305,7 @@ o Volker Lendecke <vl at samba.org>
* Add implicit temporary talloc contexts via talloc_stack().
* Speed up the smbclient "get" command
* Add the aio_fork module
+ * Fix bug 4901
o Derrell Lipman <derrell at samba.org>
* Modified libsmbclient API for more easily maintaining ABI compatibility
diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index dec9b5b..d941abb 100644
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -1913,8 +1913,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);
@@ -1922,7 +1923,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