sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

Fix removal of attributes in LDAP - we would not actually remove the old

Browse Source 
value in the previous code.

Andrew Bartlett
(This used to be commit c97d3eb1622ee25c24b0cd81b65ec7d4b854e604)
This commit is contained in:
Andrew Bartlett 2004-01-25 00:50:39 +00:00
parent eade7ab769
commit 236adfd9f4
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source3/lib/smbldap.c
View File

@ -425,7 +425,7 @@ BOOL fetch_ldap_pw(char **dn, char** pw)
/* all of our string attributes are case insensitive */
if (existed && (StrCaseCmp(oldval, newval) == 0)) {
if (existed && newval && (StrCaseCmp(oldval, newval) == 0)) {
/* Believe it or not, but LDAP will deny a delete and
an add at the same time if the values are the
@ -433,26 +433,26 @@ BOOL fetch_ldap_pw(char **dn, char** pw)
return;
}
if (existed) {
/* There has been no value before, so don't delete it.
* Here's a possible race: We might end up with
* duplicate attributes */
/* By deleting exactly the value we found in the entry this
* should be race-free in the sense that the LDAP-Server will
* deny the complete operation if somebody changed the
* attribute behind our back. */
/* This will also allow modifying single valued attributes
* in Novell NDS. In NDS you have to first remove attribute and then
* you could add new value */
smbldap_set_mod(mods, LDAP_MOD_DELETE, attribute, oldval);
}
/* Regardless of the real operation (add or modify)
we add the new value here. We rely on deleting
the old value, should it exist. */
if ((newval != NULL) && (strlen(newval) > 0)) {
if (existed) {
/* There has been no value before, so don't delete it.
* Here's a possible race: We might end up with
* duplicate attributes */
/* By deleting exactly the value we found in the entry this
* should be race-free in the sense that the LDAP-Server will
* deny the complete operation if somebody changed the
* attribute behind our back. */
/* This will also allow modifying single valued attributes
* in Novell NDS. In NDS you have to first remove attribute and then
* you could add new value */
smbldap_set_mod(mods, LDAP_MOD_DELETE, attribute, oldval);
}
smbldap_set_mod(mods, LDAP_MOD_ADD, attribute, newval);
}
}