andykimpe / rpms / 389-ds-base

Forked from rpms/389-ds-base 5 months ago
Clone

Blame 0356-Ticket-48231-logconv-autobind-handling-regression-ca.patch

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