|
 |
dc8c34 |
From cda4bf23fbe1a88008894024effb12f4860de70f Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
dc8c34 |
Date: Mon, 17 Jun 2013 14:33:16 -0700
|
|
|
dc8c34 |
Subject: [PATCH 69/99] Ticket #47391 - deleting and adding userpassword fails
|
|
|
dc8c34 |
to update the password
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Bug description: Deleting and adding password operation causes
|
|
|
dc8c34 |
the crash since once an entry is written to and retrieved from
|
|
|
dc8c34 |
DB, it does not have unhashed#user#password in the entry any
|
|
|
dc8c34 |
more. The delete userpassword internally invokes delete unhashed
|
|
|
dc8c34 |
existed in the entry.
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Fix description: This patch adds the stricter check for the NULL
|
|
|
dc8c34 |
reference.
|
|
|
dc8c34 |
|
|
|
dc8c34 |
https://fedorahosted.org/389/ticket/47391
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Reviewed by Nathan (Thanks!!)
|
|
|
dc8c34 |
(cherry picked from commit 9d9e9a6f132eb7bcbac3d3d6d39b27e38b6abb6b)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/slapd/back-ldbm/index.c | 2 +-
|
|
|
dc8c34 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/slapd/back-ldbm/index.c b/ldap/servers/slapd/back-ldbm/index.c
|
|
|
dc8c34 |
index 5948717..62a58a7 100644
|
|
|
dc8c34 |
--- a/ldap/servers/slapd/back-ldbm/index.c
|
|
|
dc8c34 |
+++ b/ldap/servers/slapd/back-ldbm/index.c
|
|
|
dc8c34 |
@@ -694,7 +694,7 @@ index_add_mods(
|
|
|
dc8c34 |
/* Check if the any values being deleted
|
|
|
dc8c34 |
* also exist in a subtype.
|
|
|
dc8c34 |
*/
|
|
|
dc8c34 |
- for ( j=0; deleted_valueArray[j] != NULL; j++) {
|
|
|
dc8c34 |
+ for (j = 0; deleted_valueArray && deleted_valueArray[j]; j++) {
|
|
|
dc8c34 |
if ( valuearray_find(curr_attr, evals, deleted_valueArray[j]) == -1 ) {
|
|
|
dc8c34 |
/* If the equality flag isn't already set, set it */
|
|
|
dc8c34 |
if (!(flags & BE_INDEX_EQUALITY)) {
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|