From 9d318cca7626451f97c691053f9965523e596640 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Thu, 19 Apr 2018 14:04:38 -0400
Subject: [PATCH] Freshen up redacted output

---
 xCAT-server/sbin/xcatd | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index 8d895aca3..cac210061 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -2751,11 +2751,13 @@ sub service_connection {
                 my $tmpstr = join(",", @{$req->{noderange}});
                 $cmdlog_alllog .= "$tmpstr ";
             }
+	    my $redacted = 0;
 
             if (exists($req->{arg})) {
                 foreach my $arg (@{ $req->{arg} }) {
                     if ($arg =~ /password/i or $arg =~ /passwd/i) {
                         $cmdlog_alllog .= "'*REDACTED*' ";
+                        $redacted = 1;
                         last;
                     }
                     if ($arg =~ /[^A-Za-z0-9.-]/) {
@@ -2768,6 +2770,7 @@ sub service_connection {
                 }
             }
             $cmdlog_alllog .= "\n[Response]\n";
+            if ($redacted) { $cmdlog_alllog .= "*REDACTED*\n"; }
 
             # ----used for command log end----------
 
@@ -3487,7 +3490,7 @@ sub cmdlog_collectlog() {
         }
     }
     if ($rsp_log =~ /password/i or $rsp_log =~ /passwd/i) {
-        $rsp_log = '*REDACTED*';
+        $rsp_log = "*REDACTED*\n";
     }
     $cmdlog_alllog .= $rsp_log;
     return 0;