[Openvas-commits] r2617 - in trunk/openvas-server: . openvasd

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2009-03-02 09:40:25 +0100 (Mon, 02 Mar 2009)
New Revision: 2617

Modified:
   trunk/openvas-server/ChangeLog
   trunk/openvas-server/openvasd/oval_plugins.c
Log:
* openvasd/oval_plugins.c: Code cleanup. Renamed child_setup to
drop_privileges to make the function intention more clear. Removed
superfluous result variable.


Modified: trunk/openvas-server/ChangeLog
===================================================================
--- trunk/openvas-server/ChangeLog	2009-03-02 07:40:24 UTC (rev 2616)
+++ trunk/openvas-server/ChangeLog	2009-03-02 08:40:25 UTC (rev 2617)
@@ -1,5 +1,11 @@
 2009-03-02  Michael Wiegand <michael.wiegand at intevation.de>
 
+	* openvasd/oval_plugins.c: Code cleanup. Renamed child_setup to
+	drop_privileges to make the function intention more clear. Removed
+	superfluous result variable.
+
+2009-03-02  Michael Wiegand <michael.wiegand at intevation.de>
+
 	* openvasd/oval_plugins.c: Beautification commit, no code changes.
 	Made indentation consistent with the coding style, added
 	documentation.

Modified: trunk/openvas-server/openvasd/oval_plugins.c
===================================================================
--- trunk/openvas-server/openvasd/oval_plugins.c	2009-03-02 07:40:24 UTC (rev 2616)
+++ trunk/openvas-server/openvasd/oval_plugins.c	2009-03-02 08:40:25 UTC (rev 2617)
@@ -99,6 +99,9 @@
   TOP
 } state_t;
 
+/**
+ * @brief The current parser state during XML parsing.
+ */
 state_t parser_state = TOP;
 
 /**
@@ -112,8 +115,6 @@
   parser_state = state;
 }
 
-gchar * result;
-
 /**
  * @brief Prepares the launch of an external executable by dropping privileges.
  *
@@ -126,7 +127,7 @@
  * @param user_data Pointer to additional data passed by glib; currently unused.
  */
 void
-child_setup (gpointer user_data)
+drop_privileges (gpointer user_data)
 {
   struct passwd * nobody_pw = NULL;
 
@@ -686,7 +687,7 @@
   argv[10] = NULL;
   //   log_write ("Launching ovaldi with: %s\n", g_strjoinv (" ", argv));
 
-  if (g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, child_setup, NULL,
+  if (g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, drop_privileges, NULL,
                     NULL, NULL, NULL, NULL))
     {
       GMarkupParser parser;