[389-commits] 3 commits - admserv/newinst configure m4/mozldap.m4 VERSION.sh

[Richard Allen Megginson]

 VERSION.sh                          |    2 +-
 admserv/newinst/src/AdminUtil.pm.in |    1 +
 configure                           |    7 +++++++
 m4/mozldap.m4                       |    7 +++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 28beea86823fc2b6effe1f29f31f38be8d3704b9
Author: Rich Megginson <rmeggins(a)redhat.com&gt;
Date:   Tue Nov 23 14:36:03 2010 -0700

    bump version to 1.1.13

diff --git a/VERSION.sh b/VERSION.sh
index 7541372..8b98cf1 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -11,7 +11,7 @@ vendorurl=http://port389.org
 # PACKAGE_VERSION is constructed from these
 VERSION_MAJOR=1
 VERSION_MINOR=1
-VERSION_MAINT=12
+VERSION_MAINT=13
 # if this is a PRERELEASE, set VERSION_PREREL
 # otherwise, comment it out
 # be sure to include the dot prefix in the prerel


commit aaa630292d2e07e145d901c4b2caae687265eab4
Author: Rich Megginson <rmeggins(a)redhat.com&gt;
Date:   Tue Nov 23 14:33:55 2010 -0700

    Bug 656441 - Missing library path entry causes LD_PRELOAD error
    
    https://bugzilla.redhat.com/show_bug.cgi?id=656441
    Resolves: bug 656441
    Bug Description: Missing library path entry causes LD_PRELOAD error
    Reviewed by: one liner
    Branch: master
    Fix Description: On some platforms pkg-config --libs will return without
    a -L/path - so try --variable=libdir too - if that doesn't work, just
    assume the mozldap libs are installed in $libdir
    Platforms tested: RHEL5 x86_64
    Flag Day: no
    Doc impact: no

diff --git a/configure b/configure
index 7ea13f2..fbc7c54 100755
--- a/configure
+++ b/configure
@@ -25088,6 +25088,13 @@ echo "$as_me: error: LDAPSDK not found, specify with
--with-ldapsdk-inc|-lib." >
       ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $mozldappkg`
       ldapsdk_lib=`$PKG_CONFIG --libs-only-L $mozldappkg`
       ldapsdk_libdir=`$PKG_CONFIG --libs-only-L $mozldappkg | sed -e s/-L// | sed -e s/\
.*$//`
+      if test -z "$ldapsdk_libdir" ; then
+            ldapsdk_libdir=`$PKG_CONFIG --variable=libdir $mozldappkg`
+      fi
+      if test -z "$ldapsdk_libdir" ; then
+            ldapsdk_libdir="$libdir"
+      fi
+
       echo "$as_me:$LINENO: result: using system $mozldappkg" >&5
 echo "${ECHO_T}using system $mozldappkg" >&6
     fi
diff --git a/m4/mozldap.m4 b/m4/mozldap.m4
index 976e41c..68533e4 100644
--- a/m4/mozldap.m4
+++ b/m4/mozldap.m4
@@ -113,6 +113,13 @@ if test "$with_ldapsdk" = yes ; then
       ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $mozldappkg`
       ldapsdk_lib=`$PKG_CONFIG --libs-only-L $mozldappkg`
       ldapsdk_libdir=`$PKG_CONFIG --libs-only-L $mozldappkg | sed -e s/-L// | sed -e s/\
.*$//`
+      if test -z "$ldapsdk_libdir" ; then
+            ldapsdk_libdir=`$PKG_CONFIG --variable=libdir $mozldappkg`
+      fi
+      if test -z "$ldapsdk_libdir" ; then
+            ldapsdk_libdir="$libdir"
+      fi
+
       AC_MSG_RESULT([using system $mozldappkg])
     fi
   fi


commit 0652e699d3cc4c09dac9c0380be6529fddb0d1a7
Author: Rich Megginson <rmeggins(a)redhat.com&gt;
Date:   Tue Nov 23 12:59:23 2010 -0700

    setup-ds-admin.pl -u exits with ServerAdminID and as_uid related error
    
    setup-ds-admin.pl -u exits with ServerAdminID and as_uid related error
    During the update, the process_maptbl function looks for ServerAdminID
    defined in the given inf, but it is not defined.  Since we get this
    information reading the existing adm.conf, just make sure it is set
    when processing each directory server to be upgraded.

diff --git a/admserv/newinst/src/AdminUtil.pm.in b/admserv/newinst/src/AdminUtil.pm.in
index 587d408..c17ed51 100644
--- a/admserv/newinst/src/AdminUtil.pm.in
+++ b/admserv/newinst/src/AdminUtil.pm.in
@@ -712,6 +712,7 @@ sub registerManyDSWithConfigDS {
         $instinf->{General}->{ConfigDirectoryLdapURL} = 
             $inf->{General}->{ConfigDirectoryLdapURL};
         $instinf->{General}->{AdminDomain} = $inf->{General}->{AdminDomain};
+        $instinf->{admin}->{ServerAdminID} = $inf->{admin}->{ServerAdminID};
         if (!registerDSWithConfigDS($inst, $errs, $instinf,
                                     $conn, $admConf, $configdir)) {
             return 0;