# HG changeset patch
# User Magnus Therning <magnus.therning@xxxxxxxxxx>
# Date 1272633676 -3600
# Node ID dbd41872d6256e37210ee107d9d17dc77060cd13
# Parent  8de47ca38b1a3495892c8c031dfdc4350bfa62f6
[CA-40987]: Fix improper Secret log filtering in the CLI.

Signed-off-by: Magnus Therning <magnus.therning@xxxxxxxxxx>

diff -r 8de47ca38b1a -r dbd41872d625 ocaml/xapi/xapi_cli.ml
--- a/ocaml/xapi/xapi_cli.ml	Fri Apr 30 11:40:56 2010 +0100
+++ b/ocaml/xapi/xapi_cli.ml	Fri Apr 30 14:21:16 2010 +0100
@@ -154,8 +154,13 @@
   let rpc = Helpers.get_rpc () req s in
   Cli_frontend.populate_cmdtable rpc Ref.null;
   (* Log the actual CLI command to help diagnose failures like CA-25516 *)
-  debug "xe %s %s" (get_cmdname cmd) (String.concat " " (List.map (fun (k, v) -> let v' = if k = "password" then "(omitted)" else v in k ^ "=" ^ v') params));
-  if get_cmdname cmd = "help"
+  let cmd_name = get_cmdname cmd in
+  if String.startswith "secret-" cmd_name
+	then
+		debug "xe %s %s" cmd_name (String.concat " " (List.map (fun (k, v) -> let v' = if k = "value" then "(omitted)" else v in k ^ "=" ^ v') params))
+	else
+		debug "xe %s %s" cmd_name (String.concat " " (List.map (fun (k, v) -> k ^ "=" ^ v) params));
+  if cmd_name = "help"
   then do_help is_compat cmd minimal s 
   else do_rpcs req s u p minimal is_compat cmd session args