From 6db32d4470b379ca220291668320146b48ed8e27 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Tue, 3 May 2016 10:21:33 +0200 Subject: [PATCH] feature #4320: Do not add multiple CREATED_BY attributes --- src/rm/RequestManagerVirtualMachine.cc | 1 - src/vm/VirtualMachine.cc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc index 89a69f3f2d..d1235e5b57 100644 --- a/src/rm/RequestManagerVirtualMachine.cc +++ b/src/rm/RequestManagerVirtualMachine.cc @@ -638,7 +638,6 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList, default: att.resp_msg = "Internal error. Action result not defined"; - failure_response(INTERNAL, att); } diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc index 04051b788d..4d73b3cec3 100644 --- a/src/vm/VirtualMachine.cc +++ b/src/vm/VirtualMachine.cc @@ -4797,7 +4797,7 @@ int VirtualMachine::generate_token_context(VectorAttribute * context, string& e) context->replace("VMID", oid); // Store the original owner to compute token_password in case of a chown - add_template_attribute("CREATED_BY", uid); + replace_template_attribute("CREATED_BY", uid); return 0; }