|
 |
61f723 |
From e9514af2fed9f882a8d11d509ffb99e49a304438 Mon Sep 17 00:00:00 2001
|
|
|
61f723 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
61f723 |
Date: Tue, 2 May 2017 16:49:59 -0400
|
|
|
61f723 |
Subject: [PATCH] Ticket 48681 - logconv.pl - fix sasl/bind stats
|
|
|
61f723 |
|
|
|
61f723 |
Description: Fixed the bind and sasl bind total counts, also adjusted the
|
|
|
61f723 |
v3 bind count to match the sasl bind.
|
|
|
61f723 |
|
|
|
61f723 |
https://pagure.io/389-ds-base/issue/48681
|
|
|
61f723 |
|
|
|
61f723 |
Reviewed by: firstyear(Thanks!)
|
|
|
61f723 |
|
|
|
61f723 |
(cherry picked from commit 770bf3a2341f1ea2e0778a6443b0f89ed77e73af)
|
|
|
61f723 |
---
|
|
|
61f723 |
ldap/admin/src/logconv.pl | 3 +++
|
|
|
61f723 |
1 file changed, 3 insertions(+)
|
|
|
61f723 |
|
|
|
61f723 |
diff --git a/ldap/admin/src/logconv.pl b/ldap/admin/src/logconv.pl
|
|
|
61f723 |
index 96639f2..c30e175 100755
|
|
|
61f723 |
--- a/ldap/admin/src/logconv.pl
|
|
|
61f723 |
+++ b/ldap/admin/src/logconv.pl
|
|
|
61f723 |
@@ -2533,6 +2533,7 @@ sub parseLineNormal
|
|
|
61f723 |
}
|
|
|
61f723 |
if (/ BIND / && /method=sasl/i){
|
|
|
61f723 |
$saslBindCount++;
|
|
|
61f723 |
+ $bindCount++;
|
|
|
61f723 |
if ($_ =~ /mech=(.*)/i ){
|
|
|
61f723 |
my $mech = $1;
|
|
|
61f723 |
$hashes->{saslmech}->{$mech}++;
|
|
|
61f723 |
@@ -2550,6 +2551,8 @@ sub parseLineNormal
|
|
|
61f723 |
if (/ RESULT err=14 tag=97 / && / SASL bind in progress/){
|
|
|
61f723 |
# Drop the sasl bind count since this is step in the bind process
|
|
|
61f723 |
$saslBindCount--;
|
|
|
61f723 |
+ $bindCount--;
|
|
|
61f723 |
+ $v3BindCount--;
|
|
|
61f723 |
my ($conn, $op);
|
|
|
61f723 |
if ($_ =~ /conn= *([0-9A-Z]+) +op= *([0-9\-]+)/i){
|
|
|
61f723 |
$conn = $1;
|
|
|
61f723 |
--
|
|
|
61f723 |
2.9.3
|
|
|
61f723 |
|