zrhoffman / rpms / 389-ds-base

Forked from rpms/389-ds-base 3 years ago
Clone

Blame SOURCES/0032-Ticket-48231-logconv-autobind-handling-regression-ca.patch

a2f18f
From ddf6d5dfd566d44a10af342d049f22b5dbe26381 Mon Sep 17 00:00:00 2001
a2f18f
From: Noriko Hosoi <nhosoi@redhat.com>
a2f18f
Date: Thu, 30 Jul 2015 11:07:40 -0700
a2f18f
Subject: [PATCH 32/39] Ticket #48231 - logconv autobind handling regression
a2f18f
 caused by 47446
a2f18f
a2f18f
Description: When there are autobinds with ldapi, the tool fails with
a2f18f
an syntax error:
a2f18f
 Use of uninitialized value in transliteration (tr///) at /Local/dirsrv/bin/logconv.pl line 2018, <$LOGFH> line 207.
a2f18f
 Use of uninitialized value $tmpp in hash element at /Local/dirsrv/bin/logconv.pl line 2019, <$LOGFH> line 207.
a2f18f
a2f18f
Thanks for providing the fix and testing it, pj101 and rmeggins@redhat.com.
a2f18f
a2f18f
Reviewed by nhosoi@redhat.com.
a2f18f
a2f18f
https://fedorahosted.org/389/ticket/48231
a2f18f
(cherry picked from commit 44a223f73a537445976a77af1652515ea46f970b)
a2f18f
(cherry picked from commit e7fc14305e7e431034d5e076f31d2ee22742578f)
a2f18f
---
a2f18f
 ldap/admin/src/logconv.pl | 2 +-
a2f18f
 1 file changed, 1 insertion(+), 1 deletion(-)
a2f18f
a2f18f
diff --git a/ldap/admin/src/logconv.pl b/ldap/admin/src/logconv.pl
a2f18f
index 3113f8a..9cd9aaa 100755
a2f18f
--- a/ldap/admin/src/logconv.pl
a2f18f
+++ b/ldap/admin/src/logconv.pl
a2f18f
@@ -2025,8 +2025,8 @@ sub parseLineNormal
a2f18f
 			if($1 eq $rootDN){
a2f18f
 				$rootDNBindCount++;
a2f18f
 			}
a2f18f
+			$tmpp = $1;
a2f18f
 			if($usage =~ /f/ || $usage =~ /u/ || $usage =~ /U/ || $usage =~ /b/ || $verb eq "yes"){
a2f18f
-				$tmpp = $1;
a2f18f
 				$tmpp =~ tr/A-Z/a-z/;
a2f18f
 				$hashes->{bindlist}->{$tmpp}++;
a2f18f
 			}
a2f18f
-- 
a2f18f
1.9.3
a2f18f