|
 |
dc8c34 |
From a20c777bda75a8b22e5b71c6657acb68c4e856cb Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Rich Megginson <rmeggins@redhat.com>
|
|
|
dc8c34 |
Date: Tue, 8 Oct 2013 11:04:31 -0600
|
|
|
dc8c34 |
Subject: [PATCH 141/225] Ticket #47551 logconv: -V does not produce unindexed
|
|
|
dc8c34 |
search report
|
|
|
dc8c34 |
|
|
|
dc8c34 |
https://fedorahosted.org/389/ticket/47551
|
|
|
dc8c34 |
Reviewed by: mreynolds (Thanks!)
|
|
|
dc8c34 |
Branch: master
|
|
|
dc8c34 |
Fix Description: Execute the $usage /u/ code also when verb == yes.
|
|
|
dc8c34 |
Platforms tested: RHEL6 x86_64
|
|
|
dc8c34 |
Flag Day: no
|
|
|
dc8c34 |
Doc impact: no
|
|
|
dc8c34 |
(cherry picked from commit 87ad36b865f85297feb40c4b61db82101b9a9447)
|
|
|
dc8c34 |
cherry pick from master did not apply cleanly and was fixed up
|
|
|
dc8c34 |
(cherry picked from commit 1197d9dd48f32fb2d5e41de06c6cea3b181acbc9)
|
|
|
dc8c34 |
(cherry picked from commit 65ec4741831214ddc480ac6077234f9eb129fb60)
|
|
|
dc8c34 |
(cherry picked from commit a4ec05dee172e6daf73607ee61a8cca9bbef74bf)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/admin/src/logconv.pl | 20 ++++++++++----------
|
|
|
dc8c34 |
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/admin/src/logconv.pl b/ldap/admin/src/logconv.pl
|
|
|
dc8c34 |
index 275ce34..7381a66 100755
|
|
|
dc8c34 |
--- a/ldap/admin/src/logconv.pl
|
|
|
dc8c34 |
+++ b/ldap/admin/src/logconv.pl
|
|
|
dc8c34 |
@@ -674,10 +674,10 @@ if ($verb eq "yes" || $usage =~ /u/ || $usage =~ /U/){
|
|
|
dc8c34 |
my $unindexedIp;
|
|
|
dc8c34 |
my %uniqFilt = (); # hash of unique filters
|
|
|
dc8c34 |
while (my ($srcnt_conn_op, $count) = each %{$notesa_conn_op}) {
|
|
|
dc8c34 |
- my ($srvRstCnt, $conn, $op) = split(",", $srcnt_conn_op);
|
|
|
dc8c34 |
- $unindexedIp = getIPfromConn($conn, $srvRstCnt);
|
|
|
dc8c34 |
- if ($usage =~ /u/) {
|
|
|
dc8c34 |
- print "\n Unindexed Search #".$notesCount."\n";
|
|
|
dc8c34 |
+ if ($verb eq "yes" || $usage =~ /u/) {
|
|
|
dc8c34 |
+ my ($srvRstCnt, $conn, $op) = split(",", $srcnt_conn_op);
|
|
|
dc8c34 |
+ my $unindexedIp = getIPfromConn($conn, $srvRstCnt);
|
|
|
dc8c34 |
+ print "\n Unindexed Search #".$notesCount." (notes=A)\n";
|
|
|
dc8c34 |
print " - Date/Time: $time_conn_op->{$srcnt_conn_op}\n";
|
|
|
dc8c34 |
print " - Connection Number: $conn\n";
|
|
|
dc8c34 |
print " - Operation Number: $op\n";
|
|
|
dc8c34 |
@@ -692,7 +692,7 @@ if ($verb eq "yes" || $usage =~ /u/ || $usage =~ /U/){
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
if (exists($filter_conn_op->{$srcnt_conn_op}) && defined($filter_conn_op->{$srcnt_conn_op})) {
|
|
|
dc8c34 |
- if ($usage =~ /u/) {
|
|
|
dc8c34 |
+ if ($verb eq "yes" || $usage =~ /u/) {
|
|
|
dc8c34 |
print " - Search Filter: $filter_conn_op->{$srcnt_conn_op}\n";
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
$uniqFilt{$filter_conn_op->{$srcnt_conn_op}}++;
|
|
|
dc8c34 |
@@ -722,10 +722,10 @@ if ($verb eq "yes" || $usage =~ /u/ || $usage =~ /U/){
|
|
|
dc8c34 |
my $unindexedIp;
|
|
|
dc8c34 |
my %uniqFilt = (); # hash of unique filters
|
|
|
dc8c34 |
while (my ($srcnt_conn_op, $count) = each %{$notesu_conn_op}) {
|
|
|
dc8c34 |
- my ($srvRstCnt, $conn, $op) = split(",", $srcnt_conn_op);
|
|
|
dc8c34 |
- $unindexedIp = getIPfromConn($conn, $srvRstCnt);
|
|
|
dc8c34 |
- if ($usage =~ /u/) {
|
|
|
dc8c34 |
- print "\n Unindexed Component #".$notesCount."\n";
|
|
|
dc8c34 |
+ if ($verb eq "yes" || $usage =~ /u/) {
|
|
|
dc8c34 |
+ my ($srvRstCnt, $conn, $op) = split(",", $srcnt_conn_op);
|
|
|
dc8c34 |
+ $unindexedIp = getIPfromConn($conn, $srvRstCnt);
|
|
|
dc8c34 |
+ print "\n Unindexed Component #".$notesCount." (notes=U)\n";
|
|
|
dc8c34 |
print " - Date/Time: $time_conn_op->{$srcnt_conn_op}\n";
|
|
|
dc8c34 |
print " - Connection Number: $conn\n";
|
|
|
dc8c34 |
print " - Operation Number: $op\n";
|
|
|
dc8c34 |
@@ -740,7 +740,7 @@ if ($verb eq "yes" || $usage =~ /u/ || $usage =~ /U/){
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
if (exists($filter_conn_op->{$srcnt_conn_op}) && defined($filter_conn_op->{$srcnt_conn_op})) {
|
|
|
dc8c34 |
- if ($usage =~ /u/) {
|
|
|
dc8c34 |
+ if ($verb eq "yes" || $usage =~ /u/) {
|
|
|
dc8c34 |
print " - Search Filter: $filter_conn_op->{$srcnt_conn_op}\n";
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
$uniqFilt{$filter_conn_op->{$srcnt_conn_op}}++;
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|