[Pkg-fedora-ds-maintainers] 389-adminutil: Changes to 'upstream'

[Timo Aaltonen]

 configure                |   20 ++++++++++----------
 configure.ac             |    2 +-
 lib/libadminutil/psetc.c |    2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 5e6518cbc2ec7e29c4472146fd63c2f88819a2f6
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Fri Sep 2 13:21:18 2016 -0700

    bump version to 1.1.23

diff --git a/configure b/configure
index a458a18..2ce20f2 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.22.
+# Generated by GNU Autoconf 2.69 for 389-adminutil 1.1.23.
 #
 # 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.22'
-PACKAGE_STRING='389-adminutil 1.1.22'
+PACKAGE_VERSION='1.1.23'
+PACKAGE_STRING='389-adminutil 1.1.23'
 PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
 PACKAGE_URL=''
 
@@ -1383,7 +1383,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.22 to adapt to many kinds of systems.
+\`configure' configures 389-adminutil 1.1.23 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1453,7 +1453,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of 389-adminutil 1.1.22:";;
+     short | recursive ) echo "Configuration of 389-adminutil 1.1.23:";;
    esac
   cat <<\_ACEOF
 
@@ -1590,7 +1590,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-389-adminutil configure 1.1.22
+389-adminutil configure 1.1.23
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2180,7 +2180,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.22, which was
+It was created by 389-adminutil $as_me 1.1.23, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3046,7 +3046,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='389-adminutil'
- VERSION='1.1.22'
+ VERSION='1.1.23'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -19204,7 +19204,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.22, which was
+This file was extended by 389-adminutil $as_me 1.1.23, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19261,7 +19261,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.22
+389-adminutil config.status 1.1.23
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 139fa76..a38e3fe 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.22], [http://bugzilla.redhat.com/])
+AC_INIT([389-adminutil], [1.1.23], [http://bugzilla.redhat.com/])
 AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST

commit 3253bef42151cbef479a3a08e50066da0f60c952
Author: Mark Reynolds <mreynolds at redhat.com>
Date:   Thu Jun 30 14:13:18 2016 -0400

    Ticket 48345 - bad check for NUL char in psetc.c
    
    Description:  There was an improper check for a NUL string.
    
                  Fix provided by community member "dcb" - Thanks!
    
    https://fedorahosted.org/389/ticket/48345
    
    Reviewed by: mreynolds(one line commit rule)

diff --git a/lib/libadminutil/psetc.c b/lib/libadminutil/psetc.c
index 6a09638..3ab72d9 100644
--- a/lib/libadminutil/psetc.c
+++ b/lib/libadminutil/psetc.c
@@ -198,7 +198,7 @@ psetNodeLDAPDestroy(PsetNodePtr target, LDAP *ld)
     }
   }
   
-  if (target->attrName && target->attrName != '\0') PR_Free(target->attrName);
+  if (target->attrName && *(target->attrName) != '\0') PR_Free(target->attrName);
   if (target->ldapHolder) ldap_msgfree(target->ldapHolder);
   if (target->attrFile) treeRemoveTree(target->attrFile);