8:50 a.m.
.gitignore | 6 +++
configure | 20 ++++++------
configure.ac | 2 -
lib/libadminutil/acclanglist.c | 6 +--
lib/libadminutil/admutil.c | 67 +++--------------------------------------
lib/libadminutil/form_post.c | 4 +-
lib/libadminutil/psetc.c | 3 -
lib/libadmsslutil/admsslutil.c | 14 --------
8 files changed, 30 insertions(+), 92 deletions(-)
New commits:
commit 0b0deef1948879311ed9c743d433924aa2632bc4
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Mon Aug 19 17:11:37 2013 -0600
bump version to 1.1.18
diff --git a/configure b/configure
index f771512..370f109 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for 389-adminutil 1.1.17.
+# Generated by GNU Autoconf 2.69 for 389-adminutil 1.1.18.
#
# Report bugs to <http://bugzilla.redhat.com/>;.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='389-adminutil'
PACKAGE_TARNAME='389-adminutil'
-PACKAGE_VERSION='1.1.17'
-PACKAGE_STRING='389-adminutil 1.1.17'
+PACKAGE_VERSION='1.1.18'
+PACKAGE_STRING='389-adminutil 1.1.18'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
PACKAGE_URL=''
@@ -1378,7 +1378,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures 389-adminutil 1.1.17 to adapt to many kinds of systems.
+\`configure' configures 389-adminutil 1.1.18 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1448,7 +1448,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of 389-adminutil 1.1.17:";;
+ short | recursive ) echo "Configuration of 389-adminutil 1.1.18:";;
esac
cat <<\_ACEOF
@@ -1583,7 +1583,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-389-adminutil configure 1.1.17
+389-adminutil configure 1.1.18
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2173,7 +2173,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by 389-adminutil $as_me 1.1.17, which was
+It was created by 389-adminutil $as_me 1.1.18, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3000,7 +3000,7 @@ fi
# Define the identity of the package.
PACKAGE='389-adminutil'
- VERSION='1.1.17'
+ VERSION='1.1.18'
cat >>confdefs.h <<_ACEOF
@@ -19147,7 +19147,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by 389-adminutil $as_me 1.1.17, which was
+This file was extended by 389-adminutil $as_me 1.1.18, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19204,7 +19204,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-389-adminutil config.status 1.1.17
+389-adminutil config.status 1.1.18
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index ccf285c..32b6222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([389-adminutil], [1.1.17], [http://bugzilla.redhat.com/])
+AC_INIT([389-adminutil], [1.1.18], [http://bugzilla.redhat.com/])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
commit ee1ef81b442305a24be16c07d2238a4143a6f007
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu Aug 15 15:49:21 2013 -0600
add Eclipse generated files
diff --git a/.gitignore b/.gitignore
index 4e68831..01246aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,8 @@
autom4te.cache
*~
+.autotools
+.cproject
+.externalToolBuilders
+.project
+.settings
+*.patch
commit 6a49f64300eb878c7010142d81fa65e4b3964b95
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu Aug 15 15:01:22 2013 -0600
Ticket #47486 - compiler warnings in adminutil, admin, dsgw
fix compiler warnings
Reviewed by: nhosoi (Thanks!)
diff --git a/lib/libadminutil/acclanglist.c b/lib/libadminutil/acclanglist.c
index 903be02..671dfcc 100644
--- a/lib/libadminutil/acclanglist.c
+++ b/lib/libadminutil/acclanglist.c
@@ -54,8 +54,8 @@ AcceptLangList(const char* AcceptLanguage,
char* cPtr;
char* cPtr1;
char* cPtr2;
- int i;
- int j;
+ size_t i;
+ size_t j;
size_t countLang = 0;
input = strdup(AcceptLanguage);
@@ -145,7 +145,7 @@ static int
langIsInList(const char *lang, size_t listsize, ACCEPT_LANGUAGE_LIST accll)
{
int retval = 0;
- int ii;
+ size_t ii;
for (ii = 0; !retval && (ii < listsize); ++ii) {
if (!strcmp(lang, accll[ii])) {
diff --git a/lib/libadminutil/admutil.c b/lib/libadminutil/admutil.c
index b4e12dd..bf04c10 100644
--- a/lib/libadminutil/admutil.c
+++ b/lib/libadminutil/admutil.c
@@ -37,20 +37,6 @@
#define strcasecmp stricmp
#define strncasecmp _strnicmp
#endif
-
-#ifdef XP_UNIX
-/*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
- */
-static char rcsid[] = "$Header: AdminUtil " ADMSDK_PRODUCT
- " " ADMSDK_BUILDNUM " $";
-static char sccsid[] = "@(#)AdminUtil " ADMSDK_PRODUCT
- " " ADMSDK_BUILDNUM;
-#endif /* XP_UNIX */
-
/* Max size for a pathname */
#ifndef PATH_MAX
@@ -2286,17 +2272,19 @@ admutil_ldap_init(
#if defined(USE_OPENLDAP)
char *certdir = admldapGetSecurityDir(info);
int optval = 0;
+#else
+ LDAP *myld = NULL;
#endif /* !USE_OPENLDAP */
int ssl_strength = 0;
- LDAP *myld = NULL;
+#if !defined(USE_OPENLDAP)
/* we can only use the set functions below with a real
LDAP* if it has already gone through ldapssl_init -
so, use NULL if using starttls */
if (secure == 1) {
myld = ld;
}
-
+#endif
/* verify certificate only */
#if defined(USE_OPENLDAP)
ssl_strength = LDAP_OPT_X_TLS_NEVER;
@@ -2414,55 +2402,12 @@ admutil_ldap_bind(
{
int rc = LDAP_SUCCESS;
int err = LDAP_SUCCESS;
- int secure = 0;
struct berval bvcreds = {0, NULL};
LDAPMessage *result = NULL;
struct berval *servercredp = NULL;
-#if defined(USE_OPENLDAP)
- /* openldap doesn't have a SSL/TLS yes/no flag - so grab the
- ldapurl, parse it, and see if it is a secure one */
- char *ldapurl = NULL;
- ldap_get_option(ld, LDAP_OPT_URI, &ldapurl);
- if (ldapurl && !PL_strncasecmp(ldapurl, "ldaps", 5)) {
- secure = 1;
- }
- PL_strfree(ldapurl);
- ldapurl = NULL;
-#else /* !USE_OPENLDAP */
- ldap_get_option(ld, LDAP_OPT_SSL, &secure);
-#endif
-
-#ifdef EXTERNAL_AUTH_SUPPORTED
- if (secure && mech && !strcmp(mech, LDAP_SASL_EXTERNAL)) {
- /* SSL connections will use the server's security context
- and cert for client auth */
- rc = slapd_SSL_client_auth(ld);
-
- if (rc != 0) {
-#ifdef DEBUG
- fprintf(stderr, "admutil_ldap_bind: "
- "Error: could not configure the server for cert "
- "auth - error %d - make sure the server is "
- "correctly configured for SSL/TLS\n", rc);
-#endif
- goto done;
- } else {
-#ifdef DEBUG
- fprintf(stderr, "admutil_ldap_bind: "
- "Set up conn to use client auth\n");
-#endif
- }
- bvcreds.bv_val = NULL; /* ignore username and passed in creds */
- bvcreds.bv_len = 0; /* for external auth */
- bindid = NULL;
- } else { /* other type of auth */
-#endif /* EXTERNAL_AUTH_SUPPORTED */
- bvcreds.bv_val = (char *)creds;
- bvcreds.bv_len = creds ? strlen(creds) : 0;
-#ifdef EXTERNAL_AUTH_SUPPORTED
- }
-#endif /* EXTERNAL_AUTH_SUPPORTED */
+ bvcreds.bv_val = (char *)creds;
+ bvcreds.bv_len = creds ? strlen(creds) : 0;
/* The connection has been set up - now do the actual bind, depending on
the mechanism and arguments */
diff --git a/lib/libadminutil/form_post.c b/lib/libadminutil/form_post.c
index cbe5299..9bc9e41 100644
--- a/lib/libadminutil/form_post.c
+++ b/lib/libadminutil/form_post.c
@@ -174,13 +174,13 @@ PR_IMPLEMENT(void)
unescape_entities(char *s)
{
int idx;
- char *p, *r, *d;
+ char *p, *r;
if (!s || !*s) {
return;
}
- d = r = s;
+ r = s;
for ( p = s; *p != '\0'; LDAP_UTF8INC( p )) {
if ( ((*p) & 0x80) == 0 && ( (*p) == '&') ) {
for( idx = 0; idx < entitynum; ++idx ) {
diff --git a/lib/libadminutil/psetc.c b/lib/libadminutil/psetc.c
index 42d0871..6a09638 100644
--- a/lib/libadminutil/psetc.c
+++ b/lib/libadminutil/psetc.c
@@ -1109,13 +1109,12 @@ psetRootModAttribute(PsetRootPtr psetRoot, int mode, NameType
name,
{
PsetPtr pset = NULL;
LDAPMod **mods;
- int nameLen, nodeFlag, errorcode;
+ int nodeFlag, errorcode;
char namebuf[256];
char *attrName, *nodeName;
ValueType valsptr;
PsetNodePtr nodePtr;
- nameLen = PL_strlen(name);
PR_snprintf(namebuf, sizeof(namebuf), "%s", name);
attrName = strrchr(namebuf, '.');
if (!attrName) {
diff --git a/lib/libadmsslutil/admsslutil.c b/lib/libadmsslutil/admsslutil.c
index a86c37c..1ba0dfa 100644
--- a/lib/libadmsslutil/admsslutil.c
+++ b/lib/libadmsslutil/admsslutil.c
@@ -51,19 +51,6 @@
#define SECURITY_ATTR "configuration.nsServerSecurity"
-#ifdef XP_UNIX
-/*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
- */
-static char rcsid[] = "$Header: AdminUtil " ADMSDK_PRODUCT
- " " ADMSDK_BUILDNUM " $";
-static char sccsid[] = "@(#)AdminUtil " ADMSDK_PRODUCT
- " " ADMSDK_BUILDNUM;
-#endif /* XP_UNIX */
-
void servssl_error(char *fmt, ...);
char custom_file[BIG_LINE] = "";
commit 77fd77a04c5bf15fdbd9db2dcebed23fbe02b447
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue Aug 13 10:05:11 2013 -0600
fix mem leak in admldapBuildInfoSSL when there is no password
Reviewed by: nhosoi (Thanks!)
Platforms tested: RHEL 6, Fedora 20
diff --git a/lib/libadmsslutil/admsslutil.c b/lib/libadmsslutil/admsslutil.c
index 7ea9eb0..a86c37c 100644
--- a/lib/libadmsslutil/admsslutil.c
+++ b/lib/libadmsslutil/admsslutil.c
@@ -106,6 +106,7 @@ admldapBuildInfoSSL(AdmldapInfo info, int *errorcode)
} else {
/* no password means just punt rather than do anon bind */
/* this mimics the same logic in admldapBuildInfoCbk() */
+ ldap_unbind_ext(ld, NULL, NULL);
*errorcode = ADMUTIL_LDAP_ERR;
return 1; /* have to return true here to mimic admldapBuildInfoCbk() */
}