configure | 20 ++++++++++----------
configure.ac | 2 +-
lib/libadminutil/admutil.c | 4 ++++
3 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit 76259fd0c0a1e0c556deb70d46bc37e73d4d9cde
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue Oct 19 10:48:17 2010 -0600
bump version to 1.1.12
bump version to 1.1.12
diff --git a/configure b/configure
index 62dc4c0..53a7edd 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.59 for 389-adminutil 1.1.11.
+# Generated by GNU Autoconf 2.59 for 389-adminutil 1.1.12.
#
# Report bugs to <
http://bugzilla.redhat.com/>.
#
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='389-adminutil'
PACKAGE_TARNAME='389-adminutil'
-PACKAGE_VERSION='1.1.11'
-PACKAGE_STRING='389-adminutil 1.1.11'
+PACKAGE_VERSION='1.1.12'
+PACKAGE_STRING='389-adminutil 1.1.12'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
# Factoring default headers for most tests.
@@ -954,7 +954,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.11 to adapt to many kinds of systems.
+\`configure' configures 389-adminutil 1.1.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of 389-adminutil 1.1.11:";;
+ short | recursive ) echo "Configuration of 389-adminutil 1.1.12:";;
esac
cat <<\_ACEOF
@@ -1189,7 +1189,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-389-adminutil configure 1.1.11
+389-adminutil configure 1.1.12
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1203,7 +1203,7 @@ cat >&5 <<_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.11, which was
+It was created by 389-adminutil $as_me 1.1.12, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1846,7 +1846,7 @@ fi
# Define the identity of the package.
PACKAGE='389-adminutil'
- VERSION='1.1.11'
+ VERSION='1.1.12'
cat >>confdefs.h <<_ACEOF
@@ -25069,7 +25069,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by 389-adminutil $as_me 1.1.11, which was
+This file was extended by 389-adminutil $as_me 1.1.12, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25127,7 +25127,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-389-adminutil config.status 1.1.11
+389-adminutil config.status 1.1.12
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed
's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index cc7fcb8..e84aa0f 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.11], [
http://bugzilla.redhat.com/])
+AC_INIT([389-adminutil], [1.1.12], [
http://bugzilla.redhat.com/])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
commit d33c9e806b4bdf1510845769712ddd363a0ac29a
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue Oct 19 10:47:26 2010 -0600
allow building with mozldap again
the fixes to build with openldap broke building with mozldap
diff --git a/lib/libadminutil/admutil.c b/lib/libadminutil/admutil.c
index fc63d31..ea207d8 100644
--- a/lib/libadminutil/admutil.c
+++ b/lib/libadminutil/admutil.c
@@ -26,8 +26,12 @@
#include "admutil_pvt.h"
#include "libadminutil/admutil-int.h"
#include "libadminutil/distadm.h"
+#include <ssl.h>
#if defined(USE_OPENLDAP)
#include <lber.h>
+#else
+#include <ldappr.h>
+#include <ldap_ssl.h>
#endif
#ifdef XP_WIN32
#define strcasecmp stricmp