configure | 20 ++++++++++----------
configure.ac | 2 +-
include/libadminutil/admutil-int.h | 1 -
lib/libadminutil/admutil.c | 10 ----------
4 files changed, 11 insertions(+), 22 deletions(-)
New commits:
commit 9b3cfced24ffe6e6ea757415c3d508a9fad6061a
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Wed Mar 19 16:29:18 2014 -0600
bump version to 1.1.20
diff --git a/configure b/configure
index 27ef738..03f518d 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.19.
+# Generated by GNU Autoconf 2.69 for 389-adminutil 1.1.20.
#
# 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.19'
-PACKAGE_STRING='389-adminutil 1.1.19'
+PACKAGE_VERSION='1.1.20'
+PACKAGE_STRING='389-adminutil 1.1.20'
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.19 to adapt to many kinds of systems.
+\`configure' configures 389-adminutil 1.1.20 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.19:";;
+ short | recursive ) echo "Configuration of 389-adminutil 1.1.20:";;
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.19
+389-adminutil configure 1.1.20
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.19, which was
+It was created by 389-adminutil $as_me 1.1.20, 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.19'
+ VERSION='1.1.20'
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.19, which was
+This file was extended by 389-adminutil $as_me 1.1.20, 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.19
+389-adminutil config.status 1.1.20
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 90f9aaf..d5b72f7 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.19], [
http://bugzilla.redhat.com/])
+AC_INIT([389-adminutil], [1.1.20], [
http://bugzilla.redhat.com/])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
commit 1c4ea9f993729ece25115953556eccb2fff337de
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Wed Mar 19 16:14:38 2014 -0600
Ticket #47680 Upgraded 389-admin rpms and now I can't start dirsrv-admin
https://fedorahosted.org/389/ticket/47680
Reviewed by: nhosoi (Thanks!)
Branch: master
Fix Description: Get rid of bogus function admldap_ldap_explode.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
diff --git a/include/libadminutil/admutil-int.h b/include/libadminutil/admutil-int.h
index 8048b6d..20992e2 100644
--- a/include/libadminutil/admutil-int.h
+++ b/include/libadminutil/admutil-int.h
@@ -187,7 +187,6 @@ int admutil_ldap_bind(
int *msgidp /* pass in non-NULL for async handling */
);
-char **admldap_ldap_explode( const char *dn, const int notypes, const int nametype );
char **admldap_ldap_explode_dn( const char *dn, const int notypes );
char **admldap_ldap_explode_rdn( const char *rdn, const int notypes );
#endif /* __ADMUTIL_INT_H__ */
diff --git a/lib/libadminutil/admutil.c b/lib/libadminutil/admutil.c
index f296b1f..839ab2d 100644
--- a/lib/libadminutil/admutil.c
+++ b/lib/libadminutil/admutil.c
@@ -2829,16 +2829,6 @@ mozldap_ldap_explode_rdn( const char *rdn, const int notypes )
#endif /* USE_OPENLDAP */
char **
-admldap_ldap_explode( const char *dn, const int notypes, const int nametype )
-{
-#if defined(USE_OPENLDAP)
- return mozldap_ldap_explode(dn, notypes, nametype);
-#else
- return ldap_explode(dn, notypes, nametype);
-#endif
-}
-
-char **
admldap_ldap_explode_dn( const char *dn, const int notypes )
{
#if defined(USE_OPENLDAP)