ldap/schema/10dna-plugin.ldif | 2 +-
ldap/servers/slapd/back-ldbm/index.c | 2 +-
ldap/servers/slapd/entry.c | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 4305deeaa41ea8703ebb9ea6529790dd609b3060
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Sat Jun 15 15:57:27 2013 -0700
Ticket #47391 - deleting and adding userpassword fails to update the password
Bug description: Deleting and adding password operation causes
the crash since once an entry is written to and retrieved from
DB, it does not have unhashed#user#password in the entry any
more. The delete userpassword internally invokes delete unhashed
existed in the entry.
Fix description: Once the internal attribute value pair is
stored in an entry extension, the mod for the attribute is
changed to the "disabled" mode. Also, this patch adds the
stricter check for the NULL reference.
https://fedorahosted.org/389/ticket/47391
Reviewed by Nathan (Thank you!!)
diff --git a/ldap/servers/slapd/back-ldbm/index.c b/ldap/servers/slapd/back-ldbm/index.c
index e45aba8..c502017 100644
--- a/ldap/servers/slapd/back-ldbm/index.c
+++ b/ldap/servers/slapd/back-ldbm/index.c
@@ -693,7 +693,7 @@ index_add_mods(
/* Check if the any values being deleted
* also exist in a subtype.
*/
- for ( j=0; deleted_valueArray[j] != NULL; j++) {
+ for (j = 0; deleted_valueArray &&
deleted_valueArray[j]; j++) {
if ( valuearray_find(curr_attr, evals,
deleted_valueArray[j]) == -1 ) {
/* If the equality flag isn't already set, set it
*/
if (!(flags & BE_INDEX_EQUALITY)) {
diff --git a/ldap/servers/slapd/entry.c b/ldap/servers/slapd/entry.c
index f730ae0..db8d906 100644
--- a/ldap/servers/slapd/entry.c
+++ b/ldap/servers/slapd/entry.c
@@ -3503,6 +3503,7 @@ slapi_entry_apply_mod_extension(Slapi_Entry *e, const LDAPMod *mod,
int modcnt)
rc = 0;
break;
}
+ ((LDAPMod *)mod)->mod_op = LDAP_MOD_IGNORE; /* we don't need it any
more */
}
}
bail:
commit 5f0580abd55b4fb34a954f0314c1188c43921363
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Sat Jun 15 16:45:23 2013 -0700
Ticket 47379 - DNA plugin failed to fetch replication agreement
Description : Schema file 10dna-plugin.ldif modified in the commit
3e2262e1c0410bdf4f9b9211aef13deb28f174d1 had a tab which should
be white spaces. It made the schema parsing fail and the server
uninstallable. This patch replaces the tab with white spaces.
diff --git a/ldap/schema/10dna-plugin.ldif b/ldap/schema/10dna-plugin.ldif
index ac9b5f4..74f5f8b 100644
--- a/ldap/schema/10dna-plugin.ldif
+++ b/ldap/schema/10dna-plugin.ldif
@@ -218,7 +218,7 @@ objectClasses: ( 2.16.840.1.113730.3.2.324 NAME
'dnaPluginConfig'
dnaThreshold $
dnaNextRange $
dnaRangeRequestTimeout $
- dnaRemoteBindDN $
+ dnaRemoteBindDN $
dnaRemoteBindCred $
cn
)