Author: timopollmeier
Date: 2016-10-17 17:51:15 +0200 (Mon, 17 Oct 2016)
New Revision: 26421

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/gsad_omp.c
Log:
        * src/gsad_omp.c (edit_report_format): Use empty string for extra_xml
        in ext_extra_xml when it is null.  Fix order of parameters in
        edit_resource call.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2016-10-17 15:25:20 UTC (rev 26420)
+++ trunk/gsa/ChangeLog 2016-10-17 15:51:15 UTC (rev 26421)
@@ -1,5 +1,11 @@
 2016-10-17  Timo Pollmeier <timo.pollme...@greenbone.net>
 
+       * src/gsad_omp.c (edit_report_format): Use empty string for extra_xml
+       in ext_extra_xml when it is null.  Fix order of parameters in
+       edit_resource call.
+
+2016-10-17  Timo Pollmeier <timo.pollme...@greenbone.net>
+
        * src/html/classic/omp.xsl (agent): Add class "icon-sm" to installer
        download icon.
 

Modified: trunk/gsa/src/gsad_omp.c
===================================================================
--- trunk/gsa/src/gsad_omp.c    2016-10-17 15:25:20 UTC (rev 26420)
+++ trunk/gsa/src/gsad_omp.c    2016-10-17 15:51:15 UTC (rev 26421)
@@ -19074,11 +19074,12 @@
 
   ext_extra_xml = g_strdup_printf ("%s"
                                    "<all_formats>%s</all_formats>",
-                                   extra_xml, all_rfs_response);
+                                   extra_xml ? extra_xml : "",
+                                   all_rfs_response);
   g_free (all_rfs_response);
 
-  response = edit_resource ("report_format", credentials, params,
-                            ext_extra_xml, NULL, response_data);
+  response = edit_resource ("report_format", credentials, params, NULL,
+                            ext_extra_xml, response_data);
   g_free (ext_extra_xml);
   return response;
 }

_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits

Reply via email to