[389-commits] Branch '389-ds-base-1.3.2' - 2 commits - VERSION.sh ldap/admin

[Noriko Hosoi]

 VERSION.sh                          |    2 +-
 ldap/admin/src/scripts/DSUtil.pm.in |   19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit 144869ff974264208f4cb7eb0e2d15c867d0ed51
Author: Noriko Hosoi <nhosoi(a)redhat.com&gt;
Date:   Mon Oct 28 10:23:52 2013 -0700

    bump version to 1.3.2.3

diff --git a/VERSION.sh b/VERSION.sh
index fc71481..ae89caa 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -10,7 +10,7 @@ vendor="389 Project"
 # PACKAGE_VERSION is constructed from these
 VERSION_MAJOR=1
 VERSION_MINOR=3
-VERSION_MAINT=2.2
+VERSION_MAINT=2.3
 # if this is a PRERELEASE, set VERSION_PREREL
 # otherwise, comment it out
 # be sure to include the dot prefix in the prerel


commit a4073a8b224641280f2cc0c5b6fe0417e34297a6
Author: Rich Megginson <rmeggins(a)redhat.com&gt;
Date:   Mon Oct 7 15:18:12 2013 -0600

    Ticket #47515 Fedora 20: setup-ds-admin.pl
    
    https://fedorahosted.org/389/ticket/47515
    Reviewed by: nhosoi (Thanks!)
    Branch: master
    Fix Description: If the last section in the last inf in process_maptbl was
    a simple string scalar, and not a hash ref, the $infsection variable would
    be set to that string scalar, and execution would pass to the next statement
    beyond the foreach loop.  The next statement would attempt to dereference
    that simple string as a hash reference.
    The fix is to just remove that test for the presence of the hash key.  If
    execution got to this point in the code, the hash key was not found, and we
    need to check for a default value, or no key at all.  Note that the old
    code would always have returned true for this condition - calling
    defined($href->{key}) will always return 0 if $href is not really a hash
    ref.
    Not sure why this is a problem on F20 - perhaps perl 5.18 in F20 is much
    more strict with "use strict".
    Platforms tested: RHEL6 x86_64, Fedora 20
    Flag Day: no
    Doc impact: no
    (cherry picked from commit 31480d928c561fb41a2511acacb03a3405bf9687)

diff --git a/ldap/admin/src/scripts/DSUtil.pm.in b/ldap/admin/src/scripts/DSUtil.pm.in
index eaf5e4b..d40d889 100644
--- a/ldap/admin/src/scripts/DSUtil.pm.in
+++ b/ldap/admin/src/scripts/DSUtil.pm.in
@@ -861,18 +861,15 @@ sub process_maptbl
                     }
                 }
             }
-            if (!defined($infsection->{$value}))
+            if ($default_value ne "")
             {
-                if ($default_value ne "")
-                {
-                    $default_value =~ tr/\"//d; # default_value is a regular double
quoted string - remove quotes
-                    $mapper->{$key} = $default_value;
-                }
-                else
-                {
-                    push @{$errs}, ['no_mapvalue_for_key', $value, $key];
-                    return {};
-                }
+                $default_value =~ tr/\"//d; # default_value is a regular double
quoted string - remove quotes
+                $mapper->{$key} = $default_value;
+            }
+            else
+            {
+                push @{$errs}, ['no_mapvalue_for_key', $value, $key];
+                return {};
             }
         }
     }