Fight Optional

[stg.git] / projects / sgconf / xml.cpp

diff --git a/projects/sgconf/xml.cpp b/projects/sgconf/xml.cpp
index 5a7d2afdaa513fab3b3e9df906fd3dab6d6bb697..93a06e23197926b2967b17af88214bddd793ebe4 100644 (file)
--- a/projects/sgconf/xml.cpp
+++ b/projects/sgconf/xml.cpp
@@ -2,6 +2,7 @@
 
 #include "api_action.h"
 #include "options.h"
+#include "makeproto.h"
 #include "config.h"
 
 #include "stg/servconf.h"
@@ -87,11 +88,7 @@ bool RawXMLFunction(const SGCONF::CONFIG & config,
                     const std::string & arg,
                     const std::map<std::string, std::string> & /*options*/)
 {
-STG::SERVCONF proto(config.server.data(),
-                    config.port.data(),
-                    config.userName.data(),
-                    config.userPass.data());
-return proto.RawXML(arg, RawXMLCallback, NULL) == STG::st_ok;
+return makeProto(config).RawXML(arg, RawXMLCallback, NULL) == STG::st_ok;
 }
 
 }
@@ -99,5 +96,5 @@ return proto.RawXML(arg, RawXMLCallback, NULL) == STG::st_ok;
 void SGCONF::AppendXMLOptionBlock(COMMANDS & commands, OPTION_BLOCKS & blocks)
 {
 blocks.Add("Raw XML")
-      .Add("r", "raw", SGCONF::MakeAPIAction(commands, "<xml>", true, RawXMLFunction), "\tmake raw XML request");
+      .Add("r", "raw", SGCONF::MakeAPIAction(commands, "<xml>", RawXMLFunction), "\tmake raw XML request");
 }