389-commits June 2014

389-commits@lists.fedoraproject.org

5 participants
66 discussions

Branch '389-ds-base-1.2.11' - ldap/servers
by Noriko Hosoi 30 Jun '14

30 Jun '14

ldap/servers/slapd/back-ldbm/ldbm_delete.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 30f1ba8154a4034137c3640007ee35cdb65131dd Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Mon Jun 30 11:27:15 2014 -0700 Ticket #47750 - Creating a glue fails if one above level is a conflict or missing Description: This commit accidentally removed the code to decrementing the reference count for the backend instance. Commit: 160cb3f686e433c01532d28770b2977ec957e73e Ticket #47750 - Creating a glue fails if one above level is a conflict or missing; Thanks to mreynolds(a)redhat.com for finding this out. (cherry picked from commit 788a48fa98bb33a6601d7a198aa63b46d12ad78d) (cherry picked from commit dfbc46a8574fdb5a2aef5a2ce1ea48400ba263aa) (cherry picked from commit f18411d98a441f26f1ef2246b62e84b72ce39ec4) diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c index 6e69d24..a3caf87 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c @@ -1326,7 +1326,9 @@ common_return: if (!delete_tombstone_entry) { plugin_call_plugins (pb, SLAPI_PLUGIN_BE_POST_DELETE_FN); } - + if (inst && inst->inst_ref_count) { + slapi_counter_decrement(inst->inst_ref_count); + } if (ruv_c_init) { modify_term(&ruv_c, be); }

1 0

Branch '389-ds-base-1.3.1' - ldap/servers
by Noriko Hosoi 30 Jun '14

30 Jun '14

ldap/servers/slapd/back-ldbm/ldbm_delete.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit f18411d98a441f26f1ef2246b62e84b72ce39ec4 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Mon Jun 30 11:27:15 2014 -0700 Ticket #47750 - Creating a glue fails if one above level is a conflict or missing Description: This commit accidentally removed the code to decrementing the reference count for the backend instance. Commit: 160cb3f686e433c01532d28770b2977ec957e73e Ticket #47750 - Creating a glue fails if one above level is a conflict or missing; Thanks to mreynolds(a)redhat.com for finding this out. (cherry picked from commit 788a48fa98bb33a6601d7a198aa63b46d12ad78d) (cherry picked from commit dfbc46a8574fdb5a2aef5a2ce1ea48400ba263aa) diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c index 3adaffb..801f6a3 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c @@ -1385,7 +1385,9 @@ common_return: if (!delete_tombstone_entry) { plugin_call_plugins (pb, SLAPI_PLUGIN_BE_POST_DELETE_FN); } - + if (inst && inst->inst_ref_count) { + slapi_counter_decrement(inst->inst_ref_count); + } if (ruv_c_init) { modify_term(&ruv_c, be); }

1 0

Branch '389-ds-base-1.3.2' - ldap/servers
by Noriko Hosoi 30 Jun '14

30 Jun '14

ldap/servers/slapd/back-ldbm/ldbm_delete.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit dfbc46a8574fdb5a2aef5a2ce1ea48400ba263aa Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Mon Jun 30 11:27:15 2014 -0700 Ticket #47750 - Creating a glue fails if one above level is a conflict or missing Description: This commit accidentally removed the code to decrementing the reference count for the backend instance. Commit: 160cb3f686e433c01532d28770b2977ec957e73e Ticket #47750 - Creating a glue fails if one above level is a conflict or missing; Thanks to mreynolds(a)redhat.com for finding this out. (cherry picked from commit 788a48fa98bb33a6601d7a198aa63b46d12ad78d) diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c index 39fe706..a365ce5 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c @@ -1385,7 +1385,9 @@ common_return: if (!delete_tombstone_entry) { plugin_call_plugins (pb, SLAPI_PLUGIN_BE_POST_DELETE_FN); } - + if (inst && inst->inst_ref_count) { + slapi_counter_decrement(inst->inst_ref_count); + } if (ruv_c_init) { modify_term(&ruv_c, be); }

1 0

ldap/servers
by Noriko Hosoi 30 Jun '14

30 Jun '14

ldap/servers/slapd/back-ldbm/ldbm_delete.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 788a48fa98bb33a6601d7a198aa63b46d12ad78d Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Mon Jun 30 11:27:15 2014 -0700 Ticket #47750 - Creating a glue fails if one above level is a conflict or missing Description: This commit accidentally removed the code to decrementing the reference count for the backend instance. Commit: 160cb3f686e433c01532d28770b2977ec957e73e Ticket #47750 - Creating a glue fails if one above level is a conflict or missing; Thanks to mreynolds(a)redhat.com for finding this out. diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c index 39fe706..a365ce5 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c @@ -1385,7 +1385,9 @@ common_return: if (!delete_tombstone_entry) { plugin_call_plugins (pb, SLAPI_PLUGIN_BE_POST_DELETE_FN); } - + if (inst && inst->inst_ref_count) { + slapi_counter_decrement(inst->inst_ref_count); + } if (ruv_c_init) { modify_term(&ruv_c, be); }

1 0

dirsrvtests/tickets
by thierry bordaz 30 Jun '14

30 Jun '14

dirsrvtests/tickets/ticket47815_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 24a4103388ce3c27e6b766644595d5e443a0a434 Author: Thierry bordaz (tbordaz) <tbordaz(a)redhat.com> Date: Mon Jun 30 14:43:25 2014 +0200 Ticket 47815 - Add operations rejected by betxn plugins remain in cache Bug Description: CI test miss '@' in fixture declaration https://fedorahosted.org/389/ticket/47815 Platforms tested: F19 jenkins Flag Day: no Doc impact: no diff --git a/dirsrvtests/tickets/ticket47815_test.py b/dirsrvtests/tickets/ticket47815_test.py index 1f2ce33..7c8f275 100644 --- a/dirsrvtests/tickets/ticket47815_test.py +++ b/dirsrvtests/tickets/ticket47815_test.py @@ -22,7 +22,7 @@ class TopologyStandalone(object): self.standalone = standalone -pytest.fixture(scope="module") +(a)pytest.fixture(scope="module") def topology(request): ''' This fixture is used to standalone topology for the 'module'.

1 0

dirsrvtests/tickets
by Noriko Hosoi 30 Jun '14

30 Jun '14

dirsrvtests/tickets/ticket47808_test.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 36323c9bb92598a253a2733b34a8c05c3c9f5f6a Author: Thierry bordaz (tbordaz) <tbordaz(a)redhat.com> Date: Sun Jun 29 12:19:42 2014 +0200 Ticket 47808 - If be_txn plugin fails in ldbm_back_add, adding entry is double freed Bug Description: CI test fix - commented the py.test fixture - unset installation_prefix https://fedorahosted.org/389/ticket/47808 Platforms tested: F19 jenkins Flag Day: no Doc impact: no diff --git a/dirsrvtests/tickets/ticket47808_test.py b/dirsrvtests/tickets/ticket47808_test.py index 4bfb4ce..d87dafc 100644 --- a/dirsrvtests/tickets/ticket47808_test.py +++ b/dirsrvtests/tickets/ticket47808_test.py @@ -15,7 +15,7 @@ from constants import * log = logging.getLogger(__name__) -installation_prefix = '/home/nhosoi/install' +installation_prefix = None ATTRIBUTE_UNIQUENESS_PLUGIN = 'cn=attribute uniqueness,cn=plugins,cn=config' ENTRY_NAME = 'test_entry' @@ -27,7 +27,7 @@ class TopologyStandalone(object): self.standalone = standalone -#(a)pytest.fixture(scope="module") +(a)pytest.fixture(scope="module") def topology(request): ''' This fixture is used to standalone topology for the 'module'. @@ -199,7 +199,7 @@ def run_isolated(): - run this program ''' global installation_prefix - installation_prefix = '/home/nhosoi/install' + installation_prefix = None topo = topology(True) test_ticket47808_run(topo)

1 0

Branch '389-ds-base-1.2.11' - ldap/servers
by Noriko Hosoi 27 Jun '14

27 Jun '14

ldap/servers/slapd/util.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) New commits: commit fe0b7956a6df4222cde2c127fd11e0cb42a5afe7 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Jun 27 12:51:30 2014 -0700 Ticket #47750 - Creating a glue fails if one above level is a conflict or missing Bug description: https://fedorahosted.org/389/ticket/47750#comment:16 Fix description: The logic in slapi_is_special_rdn to check if the RDN is a tombstone or not had a problem. Even if the first part of RDN is not nsuniqueid=<UNIQUE_ID>, it was returning true. In this patch, code to check the case is added and it returns false if the first part of RDN is not nsuniqueid=<UNIQUE_ID>. Reviewed by mreynolds(a)redhat.com and rmeggins(a)redhat.com (Thank you, Mark and Rich!!) (cherry picked from commit 286559dac7a968faa0102f0165ba56892795b269) (cherry picked from commit 36b883082265a2a5b2c818c0f7ce93e97ee55672) (cherry picked from commit 2f3852fea43efde5994b3805d65cf2fc80210d73) diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c index c566512..7a753f8 100644 --- a/ldap/servers/slapd/util.c +++ b/ldap/servers/slapd/util.c @@ -1120,7 +1120,7 @@ slapi_is_special_rdn(const char *rdn, int flag) } rp = (char *)rdn; while (rp) { - char *comma = NULL; + char *endp = NULL; if (!PL_strncasecmp(rp, SLAPI_ATTR_UNIQUEID, SLAPI_ATTR_UNIQUEID_LENGTH) && (*(rp + SLAPI_ATTR_UNIQUEID_LENGTH) == '=')) { if (RDN_IS_TOMBSTONE == flag) { @@ -1137,10 +1137,17 @@ slapi_is_special_rdn(const char *rdn, int flag) return 1; } } + } else if (RDN_IS_TOMBSTONE == flag) { + /* If the first part of rdn does not start with SLAPI_ATTR_UNIQUEID, + * it's not a tombstone RDN. */ + return 0; + } + endp = PL_strchr(rp, ','); + if (!endp) { + endp = rp + strlen(rp); } - comma = PL_strchr(rp, ','); rp = PL_strchr(rp, '+'); - if (rp && (rp < comma)) { + if (rp && (rp < endp)) { plus = 1; rp++; }

1 0

Branch '389-ds-base-1.3.1' - ldap/servers
by Noriko Hosoi 27 Jun '14

27 Jun '14

ldap/servers/slapd/util.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) New commits: commit 2f3852fea43efde5994b3805d65cf2fc80210d73 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Jun 27 12:51:30 2014 -0700 Ticket #47750 - Creating a glue fails if one above level is a conflict or missing Bug description: https://fedorahosted.org/389/ticket/47750#comment:16 Fix description: The logic in slapi_is_special_rdn to check if the RDN is a tombstone or not had a problem. Even if the first part of RDN is not nsuniqueid=<UNIQUE_ID>, it was returning true. In this patch, code to check the case is added and it returns false if the first part of RDN is not nsuniqueid=<UNIQUE_ID>. Reviewed by mreynolds(a)redhat.com and rmeggins(a)redhat.com (Thank you, Mark and Rich!!) (cherry picked from commit 286559dac7a968faa0102f0165ba56892795b269) (cherry picked from commit 36b883082265a2a5b2c818c0f7ce93e97ee55672) diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c index 880700c..e6c20dc 100644 --- a/ldap/servers/slapd/util.c +++ b/ldap/servers/slapd/util.c @@ -1436,7 +1436,7 @@ slapi_is_special_rdn(const char *rdn, int flag) } rp = (char *)rdn; while (rp) { - char *comma = NULL; + char *endp = NULL; if (!PL_strncasecmp(rp, SLAPI_ATTR_UNIQUEID, SLAPI_ATTR_UNIQUEID_LENGTH) && (*(rp + SLAPI_ATTR_UNIQUEID_LENGTH) == '=')) { if (RDN_IS_TOMBSTONE == flag) { @@ -1453,10 +1453,17 @@ slapi_is_special_rdn(const char *rdn, int flag) return 1; } } + } else if (RDN_IS_TOMBSTONE == flag) { + /* If the first part of rdn does not start with SLAPI_ATTR_UNIQUEID, + * it's not a tombstone RDN. */ + return 0; + } + endp = PL_strchr(rp, ','); + if (!endp) { + endp = rp + strlen(rp); } - comma = PL_strchr(rp, ','); rp = PL_strchr(rp, '+'); - if (rp && (rp < comma)) { + if (rp && (rp < endp)) { plus = 1; rp++; }

1 0

Branch '389-ds-base-1.3.2' - ldap/servers
by Noriko Hosoi 27 Jun '14

27 Jun '14

ldap/servers/slapd/util.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) New commits: commit 36b883082265a2a5b2c818c0f7ce93e97ee55672 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Jun 27 12:51:30 2014 -0700 Ticket #47750 - Creating a glue fails if one above level is a conflict or missing Bug description: https://fedorahosted.org/389/ticket/47750#comment:16 Fix description: The logic in slapi_is_special_rdn to check if the RDN is a tombstone or not had a problem. Even if the first part of RDN is not nsuniqueid=<UNIQUE_ID>, it was returning true. In this patch, code to check the case is added and it returns false if the first part of RDN is not nsuniqueid=<UNIQUE_ID>. Reviewed by mreynolds(a)redhat.com and rmeggins(a)redhat.com (Thank you, Mark and Rich!!) (cherry picked from commit 286559dac7a968faa0102f0165ba56892795b269) diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c index 4c23af2..3690bf7 100644 --- a/ldap/servers/slapd/util.c +++ b/ldap/servers/slapd/util.c @@ -1475,7 +1475,7 @@ slapi_is_special_rdn(const char *rdn, int flag) } rp = (char *)rdn; while (rp) { - char *comma = NULL; + char *endp = NULL; if (!PL_strncasecmp(rp, SLAPI_ATTR_UNIQUEID, SLAPI_ATTR_UNIQUEID_LENGTH) && (*(rp + SLAPI_ATTR_UNIQUEID_LENGTH) == '=')) { if (RDN_IS_TOMBSTONE == flag) { @@ -1492,10 +1492,17 @@ slapi_is_special_rdn(const char *rdn, int flag) return 1; } } + } else if (RDN_IS_TOMBSTONE == flag) { + /* If the first part of rdn does not start with SLAPI_ATTR_UNIQUEID, + * it's not a tombstone RDN. */ + return 0; + } + endp = PL_strchr(rp, ','); + if (!endp) { + endp = rp + strlen(rp); } - comma = PL_strchr(rp, ','); rp = PL_strchr(rp, '+'); - if (rp && (rp < comma)) { + if (rp && (rp < endp)) { plus = 1; rp++; }

1 0

ldap/servers
by Noriko Hosoi 27 Jun '14

27 Jun '14

ldap/servers/slapd/util.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) New commits: commit 286559dac7a968faa0102f0165ba56892795b269 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Jun 27 12:51:30 2014 -0700 Ticket #47750 - Creating a glue fails if one above level is a conflict or missing Bug description: https://fedorahosted.org/389/ticket/47750#comment:16 Fix description: The logic in slapi_is_special_rdn to check if the RDN is a tombstone or not had a problem. Even if the first part of RDN is not nsuniqueid=<UNIQUE_ID>, it was returning true. In this patch, code to check the case is added and it returns false if the first part of RDN is not nsuniqueid=<UNIQUE_ID>. Reviewed by mreynolds(a)redhat.com and rmeggins(a)redhat.com (Thank you, Mark and Rich!!) diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c index 4c23af2..3690bf7 100644 --- a/ldap/servers/slapd/util.c +++ b/ldap/servers/slapd/util.c @@ -1475,7 +1475,7 @@ slapi_is_special_rdn(const char *rdn, int flag) } rp = (char *)rdn; while (rp) { - char *comma = NULL; + char *endp = NULL; if (!PL_strncasecmp(rp, SLAPI_ATTR_UNIQUEID, SLAPI_ATTR_UNIQUEID_LENGTH) && (*(rp + SLAPI_ATTR_UNIQUEID_LENGTH) == '=')) { if (RDN_IS_TOMBSTONE == flag) { @@ -1492,10 +1492,17 @@ slapi_is_special_rdn(const char *rdn, int flag) return 1; } } + } else if (RDN_IS_TOMBSTONE == flag) { + /* If the first part of rdn does not start with SLAPI_ATTR_UNIQUEID, + * it's not a tombstone RDN. */ + return 0; + } + endp = PL_strchr(rp, ','); + if (!endp) { + endp = rp + strlen(rp); } - comma = PL_strchr(rp, ','); rp = PL_strchr(rp, '+'); - if (rp && (rp < comma)) { + if (rp && (rp < endp)) { plus = 1; rp++; }

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits June 2014