4:17 p.m.
VERSION.sh | 4 +--
ldap/ldif/90betxn-plugins.ldif | 40 ---------------------------------
ldap/servers/slapd/tools/ldclt/ldclt.c | 2 +
3 files changed, 4 insertions(+), 42 deletions(-)
New commits:
commit 7d9ccea7766bad938203a9b20fc94a865a96ede9
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Fri May 4 15:16:21 2012 -0600
bump version to 1.3.0.a1
diff --git a/VERSION.sh b/VERSION.sh
index ca25d1c..5e93c7a 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -9,8 +9,8 @@ vendor="389 Project"
# PACKAGE_VERSION is constructed from these
VERSION_MAJOR=1
-VERSION_MINOR=2
-VERSION_MAINT=11
+VERSION_MINOR=3
+VERSION_MAINT=0
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
commit 055ba38f792a2869074069086aeef910b863aea0
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Fri May 4 14:38:13 2012 -0600
Ticket #351 - use betxn plugins by default
https://fedorahosted.org/389/ticket/351
Resolves: Ticket #351
Bug Description: use betxn plugins by default
Reviewed by: nhosoi (Thanks!)
Branch: master
Fix Description: Partial revert. Removes the plugins from 90betxn-plugins.ldif
so that none of them will be betxn by default. It seems there are some
deadlocks that can occur with memberof. Rather than play whack-a-mole with
IPA, I'm going to back out this change for now, and figure out a way to
more adequately test all of the plugin interactions that occur with
IPA.
Platforms tested: RHEL6 x86_64, Fedora 17
Flag Day: no
Doc impact: no
(cherry picked from commit d63d4f282fcdbd95e6654de88e8accbbcd0e7802)
diff --git a/ldap/ldif/90betxn-plugins.ldif b/ldap/ldif/90betxn-plugins.ldif
index deedbc7..e69de29 100644
--- a/ldap/ldif/90betxn-plugins.ldif
+++ b/ldap/ldif/90betxn-plugins.ldif
@@ -1,40 +0,0 @@
-dn: cn=State Change Plugin,cn=plugins,cn=config
-changetype: modify
-replace: nsslapd-plugintype
-nsslapd-plugintype: betxnpostoperation
-
-dn: cn=MemberOf Plugin,cn=plugins,cn=config
-changetype: modify
-replace: nsslapd-plugintype
-nsslapd-plugintype: betxnpostoperation
-
-dn: cn=referential integrity postoperation,cn=plugins,cn=config
-changetype: modify
-replace: nsslapd-plugintype
-nsslapd-plugintype: betxnpostoperation
-
-dn: cn=attribute uniqueness,cn=plugins,cn=config
-changetype: modify
-replace: nsslapd-plugintype
-nsslapd-plugintype: betxnpreoperation
-
-dn: cn=Auto Membership Plugin,cn=plugins,cn=config
-changetype: modify
-replace: nsslapd-plugintype
-nsslapd-plugintype: betxnpreoperation
-
-dn: cn=Linked Attributes,cn=plugins,cn=config
-changetype: modify
-replace: nsslapd-plugintype
-nsslapd-plugintype: betxnpreoperation
-
-dn: cn=Managed Entries,cn=plugins,cn=config
-changetype: modify
-replace: nsslapd-plugintype
-nsslapd-plugintype: betxnpreoperation
-
-dn: cn=Retro Changelog Plugin,cn=plugins,cn=config
-changetype: modify
-replace: nsslapd-pluginbetxn
-nsslapd-pluginbetxn: TRUE
-
commit e13b70b725863b2e83389e00efad897be86939e7
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu May 3 08:21:53 2012 -0600
Ticket #348 - crash in ldap_initialize with multiple threads
https://fedorahosted.org/389/ticket/348
Resolves: Ticket #348
Bug Description: crash in ldap_initialize with multiple threads
Reviewed by: mreynolds (Thanks!)
Branch: master
Fix Description: ldclt was not calling PR_Init - needed in order to use
PR_CallOnce
Platforms tested: RHEL6 x86_64
Flag Day: no
Doc impact: no
(cherry picked from commit 9368250f2db4353cec7b489cb48c9c1f192f5c90)
(cherry picked from commit b72119fb54bb97998d96159f8c56831fd3742456)
diff --git a/ldap/servers/slapd/tools/ldclt/ldclt.c
b/ldap/servers/slapd/tools/ldclt/ldclt.c
index a00058b..27a2412 100644
--- a/ldap/servers/slapd/tools/ldclt/ldclt.c
+++ b/ldap/servers/slapd/tools/ldclt/ldclt.c
@@ -295,6 +295,7 @@ dd/mm/yy | Author | Comments
#include <sys/time.h> /* struct rlimit, etc... */
#endif
+#include "nspr.h"
#include "port.h" /* Portability definitions */ /*JLS 29-11-00*/
#include "ldclt.h" /* This tool's include file */
#include "utils.h" /* Utilities functions */ /*JLS 16-11-00*/
@@ -2652,6 +2653,7 @@ main (
int found; /* General purpose variable */ /*JLS 18-12-00*/
char verStr[40]; /* Version string */ /*JLS 13-03-01*/
+ PR_Init(PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 0); /* for PR_CallOnce, others */
/*
* Build the argv list to keep track of it...
* Print version.