PolicyKit: Branch 'master'

[David Zeuthen]

 polkit/polkit-context.c |   78 ++++++++++++++++++++++++------------------------
 1 file changed, 40 insertions(+), 38 deletions(-)

New commits:
diff-tree 3b73f007910c5436828b4cecdd1e47eee40eaf0c (from 2816f794b5d52f496060d1f2d1d76c7bdf69dec0)
Author: David Zeuthen <davidz at redhat.com>
Date:   Thu Aug 23 21:30:55 2007 -0400

    delay loading the configuration until it's needed
    
    This is especially good for saving CPU cycles as we may get a number
    events from inotify and previously we kept reloading/parsing the
    configuration file on every event.

diff --git a/polkit/polkit-context.c b/polkit/polkit-context.c
index d2eb86d..87d79ac 100644
--- a/polkit/polkit-context.c
+++ b/polkit/polkit-context.c
@@ -123,22 +123,6 @@ polkit_context_new (void)
         return pk_context;
 }
 
-static void
-_load_config_file (PolKitContext *pk_context)
-{
-        PolKitError *pk_error;
-
-        pk_context->config = polkit_config_new (&pk_error);
-        /* if configuration file was bad, log it */
-        if (pk_context->config == NULL) {
-                _pk_debug ("failed to load configuration file: %s", 
-                           polkit_error_get_error_message (pk_error));
-                syslog (LOG_ALERT, "libpolkit: failed to load configuration file: %s", 
-                        polkit_error_get_error_message (pk_error));
-                polkit_error_free (pk_error);
-        }
-}
-
 /**
  * polkit_context_init:
  * @pk_context: the context object
@@ -165,8 +149,7 @@ polkit_context_init (PolKitContext *pk_c
 
         /* NOTE: we don't populate the cache until it's needed.. */
 
-        /* Load configuration file */
-        _load_config_file (pk_context);
+        /* NOTE: we don't load the configuration file until it's needed */
 
         if (pk_context->io_add_watch_func != NULL) {
                 pk_context->inotify_fd = inotify_init ();
@@ -358,22 +341,23 @@ again:
 
         if (config_changed) {
                 /* purge existing policy files */
-                        _pk_debug ("purging policy files");
-                        if (pk_context->priv_cache != NULL) {
-                                polkit_policy_cache_unref (pk_context->priv_cache);
-                                pk_context->priv_cache = NULL;
-                        }
-                        
-                        /* Purge old config and reload configuration file */
-                        _pk_debug ("reloading configuration file");
-                        if (pk_context->config != NULL)
-                                polkit_config_unref (pk_context->config);
-                        _load_config_file (pk_context);
-                        
-                        if (pk_context->config_changed_cb != NULL) {
-                                pk_context->config_changed_cb (pk_context, 
-                                                               pk_context->config_changed_user_data);
-                        }
+                _pk_debug ("purging policy files");
+                if (pk_context->priv_cache != NULL) {
+                        polkit_policy_cache_unref (pk_context->priv_cache);
+                        pk_context->priv_cache = NULL;
+                }
+                
+                /* Purge existing old config file */
+                _pk_debug ("purging configuration file");
+                if (pk_context->config != NULL) {
+                        polkit_config_unref (pk_context->config);
+                        pk_context->config = NULL;
+                }
+                
+                if (pk_context->config_changed_cb != NULL) {
+                        pk_context->config_changed_cb (pk_context, 
+                                                       pk_context->config_changed_user_data);
+                }
         }
 }
 
@@ -470,12 +454,14 @@ polkit_context_can_session_do_action (Po
         PolKitPolicyFileEntry *pfe;
         PolKitPolicyDefault *policy_default;
         PolKitResult result;
+        PolKitConfig *config;
 
         result = POLKIT_RESULT_NO;
         g_return_val_if_fail (pk_context != NULL, result);
 
+        config = polkit_context_get_config (pk_context);
         /* if the configuration file is malformed, always say no */
-        if (pk_context->config == NULL)
+        if (config == NULL)
                 goto out;
 
         if (action == NULL || session == NULL)
@@ -510,7 +496,7 @@ polkit_context_can_session_do_action (Po
         polkit_policy_file_entry_debug (pfe);
 
         /* check if the config file specifies a result */
-        result = polkit_config_can_session_do_action (pk_context->config, action, session);
+        result = polkit_config_can_session_do_action (config, action, session);
         if (result != POLKIT_RESULT_UNKNOWN)
                 goto found;
 
@@ -552,12 +538,14 @@ polkit_context_can_caller_do_action (Pol
         PolKitPolicyFileEntry *pfe;
         PolKitResult result;
         PolKitPolicyDefault *policy_default;
+        PolKitConfig *config;
 
         result = POLKIT_RESULT_NO;
         g_return_val_if_fail (pk_context != NULL, result);
 
         /* if the configuration file is malformed, always say no */
-        if (pk_context->config == NULL)
+        config = polkit_context_get_config (pk_context);
+        if (config == NULL)
                 goto out;
 
         if (action == NULL || caller == NULL)
@@ -597,7 +585,7 @@ polkit_context_can_caller_do_action (Pol
                 goto found;
 
         /* second, check if the config file specifies a result */
-        result = polkit_config_can_caller_do_action (pk_context->config, action, caller);
+        result = polkit_config_can_caller_do_action (config, action, caller);
         if (result != POLKIT_RESULT_UNKNOWN)
                 goto found;
 
@@ -634,6 +622,20 @@ out:
 PolKitConfig *
 polkit_context_get_config (PolKitContext *pk_context)
 {
+        if (pk_context->config == NULL) {
+                PolKitError *pk_error;
+
+                _pk_debug ("loading configuration file");
+                pk_context->config = polkit_config_new (&pk_error);
+                /* if configuration file was bad, log it */
+                if (pk_context->config == NULL) {
+                        _pk_debug ("failed to load configuration file: %s", 
+                                   polkit_error_get_error_message (pk_error));
+                        syslog (LOG_ALERT, "libpolkit: failed to load configuration file: %s", 
+                                polkit_error_get_error_message (pk_error));
+                        polkit_error_free (pk_error);
+                }
+        }
         return pk_context->config;
 }