[Openvas-commits] r5440 - in trunk/openvas-client: . openvas openvas/prefs_dialog

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-10-08 12:26:01 +0200 (Thu, 08 Oct 2009)
New Revision: 5440

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/openvas/openvas-client.c
   trunk/openvas-client/openvas/prefs_dialog/prefs_scope_tree.c
Log:
	* openvas/openvas-client.c [USE_OMP] (refresh_server): Remove
	context_save_recurse.

	* openvas/prefs_dialog/prefs_scope_tree.c [USE_OMP] (scopetree_refresh):
	Call context_save_recurse after prefs_context_update after refresh_server,
	so that plugin prefs are synced before the RC is saved.

Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-10-08 09:41:23 UTC (rev 5439)
+++ trunk/openvas-client/ChangeLog	2009-10-08 10:26:01 UTC (rev 5440)
@@ -1,3 +1,12 @@
+2009-10-08  Matthew Mundell <matthew.mundell at intevation.de>
+
+	* openvas/openvas-client.c [USE_OMP] (refresh_server): Remove
+	context_save_recurse.
+
+	* openvas/prefs_dialog/prefs_scope_tree.c [USE_OMP] (scopetree_refresh):
+	Call context_save_recurse after prefs_context_update after refresh_server,
+	so that plugin prefs are synced before the RC is saved.
+
 2009-10-07  Matthew Mundell <matthew.mundell at intevation.de>
 
 	* openvas/prefs_dialog/prefs_scope_tree.c [USE_OMP] (create_omp_scope):

Modified: trunk/openvas-client/openvas/openvas-client.c
===================================================================
--- trunk/openvas-client/openvas/openvas-client.c	2009-10-08 09:41:23 UTC (rev 5439)
+++ trunk/openvas-client/openvas/openvas-client.c	2009-10-08 10:26:01 UTC (rev 5440)
@@ -460,9 +460,6 @@
       plugin_cache_write (context, context->plugins_md5sum);
     }
 
-  /* Save the RC to disk, so that new scopes can copy it. */
-  context_save_recurse (context);
-
   return NULL;
 }
 #endif /* USE_OMP */

Modified: trunk/openvas-client/openvas/prefs_dialog/prefs_scope_tree.c
===================================================================
--- trunk/openvas-client/openvas/prefs_dialog/prefs_scope_tree.c	2009-10-08 09:41:23 UTC (rev 5439)
+++ trunk/openvas-client/openvas/prefs_dialog/prefs_scope_tree.c	2009-10-08 10:26:01 UTC (rev 5440)
@@ -1253,8 +1253,12 @@
   /* Refresh the information about the manager. */
 
   message = refresh_server (context);
-  // FIX why? (was setting _login here and saving prefs)
+  /* This is necessary, at least because it calls context_sync_plugin_prefs,
+   * which copies plugin prefs from context->plugins and context->scanners to
+   * context->plugin_prefs. */
   prefs_context_update (context);
+  /* Save the RC to disk, so that new scopes can copy it. */
+  context_save_recurse (context);
   if (message)
     {
       openvas_server_close (context->socket, context->session);