- qmf/qpid doesn't allow null as an acceptable return argument so raising an exception to alert end user of possible status conflicts resolves rhbz 733384, 733451
Signed-off-by: Adam Stokes astokes@fedoraproject.org --- src/sysconfig/sysconfig-qmf.cpp | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/sysconfig/sysconfig-qmf.cpp b/src/sysconfig/sysconfig-qmf.cpp index 442d27a..94415e5 100644 --- a/src/sysconfig/sysconfig-qmf.cpp +++ b/src/sysconfig/sysconfig-qmf.cpp @@ -93,24 +93,24 @@ ConfigAgent::invoke(qmf::AgentSession session, qmf::AgentEvent event, gpointer u args["scheme"].asString().c_str(), args["key"].asString().c_str()); status = mh_sysconfig_is_configured(args["key"].asString().c_str()); - event.addReturnArgument("status", status); + event.addReturnArgument("status", status ? status : "unknown"); } else if (methodName == "run_string") { mh_sysconfig_run_string(args["data"].asString().c_str(), args["flags"].asUint32(), args["scheme"].asString().c_str(), args["key"].asString().c_str()); status = mh_sysconfig_is_configured(args["key"].asString().c_str()); - event.addReturnArgument("status", status); + event.addReturnArgument("status", status ? status : "unknown"); } else if (methodName == "query") { const char *data = NULL; data = mh_sysconfig_query(args["query"].asString().c_str(), args["flags"].asUint32(), args["scheme"].asString().c_str()); - event.addReturnArgument("query", data); + event.addReturnArgument("data", data ? data : "unknown"); } else if (methodName == "is_configured") { status = mh_sysconfig_is_configured(args["key"].asString().c_str()); _instance.setProperty("is_postboot_configured", status); - event.addReturnArgument("status", status); + event.addReturnArgument("status", status ? status : "unknown"); } else { session.raiseException(event, MH_NOT_IMPLEMENTED); goto bail;