VERSION.sh | 2 +-
ldap/servers/slapd/tools/ldclt/ldapfct.c | 22 +++++++++++++++-------
2 files changed, 16 insertions(+), 8 deletions(-)
New commits:
commit ce1d30ad1a68942638dfc954267b546311fbc49f
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu Aug 4 08:20:27 2011 -0600
bump version to 1.2.9.4
diff --git a/VERSION.sh b/VERSION.sh
index a17a536..638d714 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -10,7 +10,7 @@ vendor="389 Project"
# PACKAGE_VERSION is constructed from these
VERSION_MAJOR=1
VERSION_MINOR=2
-VERSION_MAINT=9.3
+VERSION_MAINT=9.4
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
commit d2d1b52f4bbd1eed4d971de7684c22d0153f2823
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu Aug 4 08:19:05 2011 -0600
Bug 727511 - ldclt SSL search requests are failing with "illegal error number
-1" error
https://bugzilla.redhat.com/show_bug.cgi?id=727511
Resolves: bug 727511
Bug Description: ldclt SSL search requests are failing with "illegal error number
-1" error
Reviewed by: me
Branch: master
Fix Description: Fix coverity NULL deref defect
Platforms tested: RHEL6 x86_64
Flag Day: no
Doc impact: no
diff --git a/ldap/servers/slapd/tools/ldclt/ldapfct.c
b/ldap/servers/slapd/tools/ldclt/ldapfct.c
index 6d9e815..cd097d7 100644
--- a/ldap/servers/slapd/tools/ldclt/ldapfct.c
+++ b/ldap/servers/slapd/tools/ldclt/ldapfct.c
@@ -641,11 +641,16 @@ ldclt_clientauth(thread_context *tttctx, const char *path, const
char *certname,
char *token_name = NULL;
PK11SlotInfo *slot = NULL;
int rc = 0;
+ int thrdNum = 0;
+
+ if (tttctx) {
+ thrdNum = tttctx->thrdNum;
+ }
rc = NSS_Initialize(path, "", "", SECMOD_DB, NSS_INIT_READONLY);
if (rc != SECSuccess) {
printf ("ldclt[%d]: T%03d: Cannot NSS_Initialize(%s) %d\n",
- mctx.pid, tttctx->thrdNum, path, PR_GetError());
+ mctx.pid, thrdNum, path, PR_GetError());
fflush(stdout);
goto done;
}
@@ -662,7 +667,7 @@ ldclt_clientauth(thread_context *tttctx, const char *path, const char
*certname,
if (!slot) {
printf ("ldclt[%d]: T%03d: Cannot find slot for token %s - %d\n",
- mctx.pid, tttctx->thrdNum,
+ mctx.pid, thrdNum,
token_name ? token_name : "internal", PR_GetError());
fflush(stdout);
goto done;
@@ -675,7 +680,7 @@ ldclt_clientauth(thread_context *tttctx, const char *path, const char
*certname,
rc = PK11_Authenticate(slot, PR_FALSE, (void *)pwd);
if (rc != SECSuccess) {
printf ("ldclt[%d]: T%03d: Cannot authenticate to token %s - %d\n",
- mctx.pid, tttctx->thrdNum,
+ mctx.pid, thrdNum,
token_name ? token_name : "internal", PR_GetError());
fflush(stdout);
goto done;
@@ -683,14 +688,14 @@ ldclt_clientauth(thread_context *tttctx, const char *path, const
char *certname,
if ((rc = ldap_set_option(tttctx->ldapCtx, LDAP_OPT_X_TLS_CERTFILE, certname))) {
printf ("ldclt[%d]: T%03d: Cannot ldap_set_option(ld, LDAP_OPT_X_CERTFILE, %s),
errno=%d ldaperror=%d:%s\n",
- mctx.pid, tttctx->thrdNum, certname, errno, rc, my_ldap_err2string(rc));
+ mctx.pid, thrdNum, certname, errno, rc, my_ldap_err2string(rc));
fflush (stdout);
goto done;
}
if ((rc = ldap_set_option(tttctx->ldapCtx, LDAP_OPT_X_TLS_KEYFILE, pwd))) {
printf ("ldclt[%d]: T%03d: Cannot ldap_set_option(ld, LDAP_OPT_X_KEYFILE, %s),
errno=%d ldaperror=%d:%s\n",
- mctx.pid, tttctx->thrdNum, pwd, errno, rc, my_ldap_err2string(rc));
+ mctx.pid, thrdNum, pwd, errno, rc, my_ldap_err2string(rc));
fflush (stdout);
goto done;
}
commit f5f4f06d299246e3332b3e69fbc33598e1c92c37
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Wed Aug 3 21:06:23 2011 -0600
bump version to 1.2.9.3
diff --git a/VERSION.sh b/VERSION.sh
index bfdcfe2..a17a536 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -10,7 +10,7 @@ vendor="389 Project"
# PACKAGE_VERSION is constructed from these
VERSION_MAJOR=1
VERSION_MINOR=2
-VERSION_MAINT=9.2
+VERSION_MAINT=9.3
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
commit 009660a527f21552ec78f90b1e78c662222021ed
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Wed Aug 3 21:04:52 2011 -0600
Bug 727511 - ldclt SSL search requests are failing with "illegal error numbe
r -1" error
https://bugzilla.redhat.com/show_bug.cgi?id=727511
Resolves: bug 727511
Bug Description: ldclt SSL search requests are failing with "illegal error number
-1" error
Reviewed by: me
Branch: master
Fix Description: Put openldap specific code inside ifdef block.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
diff --git a/ldap/servers/slapd/tools/ldclt/ldapfct.c
b/ldap/servers/slapd/tools/ldclt/ldapfct.c
index 7123a1a..6d9e815 100644
--- a/ldap/servers/slapd/tools/ldclt/ldapfct.c
+++ b/ldap/servers/slapd/tools/ldclt/ldapfct.c
@@ -603,6 +603,7 @@ referralSetup (
+#if defined(USE_OPENLDAP)
/* ****************************************************************************
FUNCTION : dirname
PURPOSE : given a relative or absolute path name, return
@@ -702,6 +703,7 @@ done:
return rc;
}
+#endif /* USE_OPENLDAP */
/* mctx is a global */
LDAP *
@@ -1076,16 +1078,17 @@ connectToLDAP(thread_context *tttctx, const char *bufBindDN, const
char *bufPass
}
}
- done:
+done:
if (ret) {
ldap_unbind_ext(ld, NULL, NULL);
ld = NULL;
}
+#if defined(USE_OPENLDAP)
if (ldapurl) {
PR_smprintf_free(ldapurl);
ldapurl = NULL;
}
-
+#endif
return ld;
}