|
 |
dc8c34 |
From 7afea3c29faea062f06ee97cd71496a8f7d5765c Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
dc8c34 |
Date: Tue, 23 Sep 2014 15:22:11 -0700
|
|
|
dc8c34 |
Subject: [PATCH 269/305] Ticket #47907 - ldclt: assertion failure with -e
|
|
|
dc8c34 |
"add,counteach" -e "object=<ldif file>,rdn=uid:test[A=INCRNNOLOOP(0;24
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Bug Description: In case createMissingNodes is called from doAddEntry,
|
|
|
dc8c34 |
LDAP handle is unbound which makes the following operation such as
|
|
|
dc8c34 |
ldap_add fail since the handle is already released.
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Fix Description: Rempoving ldap_unbind_ext from createMissingNodes.
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Reviewed by rmeggins@redhat.com (Thank you, Rich!!)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
https://fedorahosted.org/389/ticket/47907
|
|
|
dc8c34 |
(cherry picked from commit 685607f63d52d54e8bd094bb0694986484a91e34)
|
|
|
dc8c34 |
(cherry picked from commit 906106b6778fc1cddf49b109765b1d6b4753eab9)
|
|
|
dc8c34 |
(cherry picked from commit 8c955b1709c041687d981a8a77dde020a4860dc5)
|
|
|
dc8c34 |
(cherry picked from commit dd62c7582608298297ee104374b88c5d5398e790)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/slapd/tools/ldclt/ldapfct.c | 11 -----------
|
|
|
dc8c34 |
1 file changed, 11 deletions(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/slapd/tools/ldclt/ldapfct.c b/ldap/servers/slapd/tools/ldclt/ldapfct.c
|
|
|
dc8c34 |
index b177d7c..8fd3304 100644
|
|
|
dc8c34 |
--- a/ldap/servers/slapd/tools/ldclt/ldapfct.c
|
|
|
dc8c34 |
+++ b/ldap/servers/slapd/tools/ldclt/ldapfct.c
|
|
|
dc8c34 |
@@ -2308,17 +2308,6 @@ createMissingNodes (
|
|
|
dc8c34 |
if (freeAttrib (attrs) < 0)
|
|
|
dc8c34 |
return (-1);
|
|
|
dc8c34 |
|
|
|
dc8c34 |
- ret = ldap_unbind_ext (cnx, NULL, NULL);
|
|
|
dc8c34 |
- if (ret != LDAP_SUCCESS)
|
|
|
dc8c34 |
- {
|
|
|
dc8c34 |
- fprintf (stderr, "ldclt[%d]: T%03d: cannot ldap_unbind(), error=%d (%s)\n",
|
|
|
dc8c34 |
- mctx.pid, tttctx->thrdNum, ret, strerror (ret));
|
|
|
dc8c34 |
- fflush (stderr);
|
|
|
dc8c34 |
- if (addErrorStat (ret) < 0)
|
|
|
dc8c34 |
- return (-1);
|
|
|
dc8c34 |
- return (-1);
|
|
|
dc8c34 |
- }
|
|
|
dc8c34 |
-
|
|
|
dc8c34 |
/*
|
|
|
dc8c34 |
* Ouf ! End of this function.
|
|
|
dc8c34 |
*/
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.9.3
|
|
|
dc8c34 |
|