[Openvas-commits] r6208 - in trunk/openvas-administrator: . src

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2009-12-21 09:24:07 +0100 (Mon, 21 Dec 2009)
New Revision: 6208

Modified:
   trunk/openvas-administrator/ChangeLog
   trunk/openvas-administrator/src/oap.c
Log:
* src/oap.c (oap_xml_handle_end_element): Include name of settings file
in error message.


Modified: trunk/openvas-administrator/ChangeLog
===================================================================
--- trunk/openvas-administrator/ChangeLog	2009-12-21 06:14:17 UTC (rev 6207)
+++ trunk/openvas-administrator/ChangeLog	2009-12-21 08:24:07 UTC (rev 6208)
@@ -1,3 +1,8 @@
+2009-12-21  Michael Wiegand <michael.wiegand at intevation.de>
+
+	* src/oap.c (oap_xml_handle_end_element): Include name of settings file
+	in error message.
+
 2009-12-17  Michael Wiegand <michael.wiegand at intevation.de>
 
 	Added support for retrieving settings from configuration files.

Modified: trunk/openvas-administrator/src/oap.c
===================================================================
--- trunk/openvas-administrator/src/oap.c	2009-12-21 06:14:17 UTC (rev 6207)
+++ trunk/openvas-administrator/src/oap.c	2009-12-21 08:24:07 UTC (rev 6208)
@@ -1135,7 +1135,11 @@
               }
             else
               {
-                SEND_TO_CLIENT_OR_FAIL (XML_INTERNAL_ERROR ("get_settings"));
+                SENDF_TO_CLIENT_OR_FAIL ("<get_settings_response"
+                                        " status=\"" STATUS_ERROR_MISSING "\""
+                                        " status_text=\"Could not read settings from %s\">",
+                                        scanner_config_file);
+                SEND_TO_CLIENT_OR_FAIL ("</get_settings_response>");
               }
             set_client_state (CLIENT_AUTHENTIC);
             break;