PolicyKit: Branch 'master'

David Zeuthen david at kemper.freedesktop.org
Sun Nov 11 14:12:58 PST 2007


 src/polkit-dbus/Makefile.am                |    2 
 src/polkit/Makefile.am                     |    5 -
 src/polkit/polkit-authorization-db-dummy.c |    6 --
 src/polkit/polkit-authorization-db.c       |   74 +++++++++++------------------
 4 files changed, 34 insertions(+), 53 deletions(-)

New commits:
commit 756043c71cc000e080ebff0dbc9aacf3ee146636
Author: David Zeuthen <davidz at redhat.com>
Date:   Sun Nov 11 17:09:26 2007 -0500

    remove glib dependency from libpolkit.so

diff --git a/src/polkit-dbus/Makefile.am b/src/polkit-dbus/Makefile.am
index e39d046..7e0da48 100644
--- a/src/polkit-dbus/Makefile.am
+++ b/src/polkit-dbus/Makefile.am
@@ -23,7 +23,7 @@ libpolkit_dbusinclude_HEADERS =              			\
 libpolkit_dbus_la_SOURCES =                                	\
 	polkit-dbus.h		polkit-dbus.c
 
-libpolkit_dbus_la_LIBADD = @DBUS_LIBS@ $(top_builddir)/src/polkit/libpolkit.la $(SELINUX_LIBS)
+libpolkit_dbus_la_LIBADD = @DBUS_LIBS@ $(top_builddir)/src/polkit/libpolkit.la $(SELINUX_LIBS) $(GLIB_LIBS)
 
 libpolkit_dbus_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
diff --git a/src/polkit/Makefile.am b/src/polkit/Makefile.am
index 2703da8..ad53c83 100644
--- a/src/polkit/Makefile.am
+++ b/src/polkit/Makefile.am
@@ -11,8 +11,7 @@ INCLUDES = \
 	-DPACKAGE_LIB_DIR=\""$(libdir)"\" \
 	-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT	\
 	-DPOLKIT_COMPILATION \
-	-DTEST_DATA_DIR=\"$(top_srcdir)/test/\" \
-	@GLIB_CFLAGS@
+	-DTEST_DATA_DIR=\"$(top_srcdir)/test/\"
 
 lib_LTLIBRARIES=libpolkit.la
 
@@ -71,7 +70,7 @@ libpolkit_la_SOURCES +=                                					\
 						polkit-authorization-db.c
 endif
 
-libpolkit_la_LIBADD = @GLIB_LIBS@ @EXPAT_LIBS@ $(top_builddir)/src/kit/libkit.la
+libpolkit_la_LIBADD = @EXPAT_LIBS@ $(top_builddir)/src/kit/libkit.la
 
 libpolkit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
diff --git a/src/polkit/polkit-authorization-db-dummy.c b/src/polkit/polkit-authorization-db-dummy.c
index 023d764..11ed887 100644
--- a/src/polkit/polkit-authorization-db-dummy.c
+++ b/src/polkit/polkit-authorization-db-dummy.c
@@ -39,8 +39,6 @@
 #include <fcntl.h>
 #include <pwd.h>
 
-#include <glib.h>
-
 #include "polkit-debug.h"
 #include "polkit-authorization-db.h"
 #include "polkit-utils.h"
@@ -59,7 +57,7 @@ _polkit_authorization_db_new (void)
 {
         PolKitAuthorizationDB *authdb;
 
-        authdb = g_new0 (PolKitAuthorizationDB, 1);
+        authdb = kit_new0 (PolKitAuthorizationDB, 1);
         authdb->refcount = 1;
 
         return authdb;
@@ -95,7 +93,7 @@ polkit_authorization_db_unref (PolKitAuthorizationDB *authdb)
         authdb->refcount--;
         if (authdb->refcount > 0) 
                 return;
-        g_free (authdb);
+        kit_free (authdb);
 }
 
 void 
diff --git a/src/polkit/polkit-authorization-db.c b/src/polkit/polkit-authorization-db.c
index 3be89c7..99b6d64 100644
--- a/src/polkit/polkit-authorization-db.c
+++ b/src/polkit/polkit-authorization-db.c
@@ -39,8 +39,6 @@
 #include <fcntl.h>
 #include <pwd.h>
 
-#include <glib.h>
-
 #include "polkit-debug.h"
 #include "polkit-authorization-db.h"
 #include "polkit-utils.h"
@@ -253,15 +251,14 @@ _polkit_authorization_db_invalidate_cache (PolKitAuthorizationDB *authdb)
  *
  * Since: 0.7
  */
-static GSList *
+static KitList *
 _authdb_get_auths_for_uid (PolKitAuthorizationDB *authdb,
                            uid_t                  uid,
                            PolKitError          **error)
 {
-        GSList *ret;
+        KitList *ret;
         char *helper_argv[] = {PACKAGE_LIBEXEC_DIR "/polkit-read-auth-helper", NULL, NULL};
-        gint exit_status;
-        GError *g_error;
+        int exit_status;
         char *standard_output;
         size_t len;
         off_t n;
@@ -280,27 +277,21 @@ _authdb_get_auths_for_uid (PolKitAuthorizationDB *authdb,
          * because the auth file is readable only for uid 0 and gid
          * polkituser.
          */
-        g_error = NULL;
-        if (!g_spawn_sync (NULL,             /* const gchar *working_directory */
-                           helper_argv,      /* gchar **argv */
-                           NULL,             /* gchar **envp */
-                           0,                /* GSpawnFlags flags */
-                           NULL,             /* GSpawnChildSetupFunc child_setup */
-                           NULL,             /* gpointer user_data */
-                           &standard_output, /* gchar **standard_output */
-                           NULL,             /* gchar **standard_error */
-                           &exit_status,     /* gint *exit_status */
-                           &g_error)) {      /* GError **error */
+        if (!kit_spawn_sync (NULL,             /* const char  *working_directory */
+                             helper_argv,      /* char       **argv */
+                             NULL,             /* char       **envp */
+                             NULL,             /* char        *stdin */
+                             &standard_output, /* char       **stdout */
+                             NULL,             /* char       **stderr */
+                             &exit_status)) {  /* int         *exit_status */
                 polkit_error_set_error (error, 
                                         POLKIT_ERROR_GENERAL_ERROR, 
-                                        "Error spawning read auth helper: %s",
-                                        g_error->message);
-                g_error_free (g_error);
+                                        "Error spawning read auth helper: %m");
                 goto out;
         }
 
         if (!WIFEXITED (exit_status)) {
-                g_warning ("Read auth helper crashed!");
+                kit_warning ("Read auth helper crashed!");
                 polkit_error_set_error (error, 
                                         POLKIT_ERROR_GENERAL_ERROR, 
                                         "Read auth helper crashed!");
@@ -345,7 +336,7 @@ _authdb_get_auths_for_uid (PolKitAuthorizationDB *authdb,
                         auth = _polkit_authorization_new_for_uid (line, uid);
                         
                         if (auth != NULL) {
-                                ret = g_slist_prepend (ret, auth);
+                                ret = kit_list_prepend (ret, auth);
                         }
                 }
 
@@ -369,8 +360,8 @@ _internal_foreach (PolKitAuthorizationDB       *authdb,
                    void                        *user_data,
                    PolKitError                **error)
 {
-        GSList *l;
-        GSList *auths;
+        KitList *l;
+        KitList *auths;
         polkit_bool_t ret;
         char *action_id;
 
@@ -544,7 +535,7 @@ typedef struct {
 static polkit_bool_t 
 _check_auth_for_session (PolKitAuthorizationDB *authdb, PolKitAuthorization *auth, void *user_data)
 {
-        gboolean ret;
+        polkit_bool_t ret;
         CheckDataSession *cd = (CheckDataSession *) user_data;
         PolKitAuthorizationConstraint *constraint;
 
@@ -649,7 +640,7 @@ static polkit_bool_t
 _check_auth_for_caller (PolKitAuthorizationDB *authdb, PolKitAuthorization *auth, void *user_data)
 {
 
-        gboolean ret;
+        polkit_bool_t ret;
         pid_t caller_pid;
         polkit_uint64_t caller_pid_start_time;
         CheckData *cd = (CheckData *) user_data;
@@ -680,7 +671,7 @@ _check_auth_for_caller (PolKitAuthorizationDB *authdb, PolKitAuthorization *auth
                         if (cd->revoke_if_one_shot) {
                                 error = NULL;
                                 if (!polkit_authorization_db_revoke_entry (authdb, auth, &error)) {
-                                        g_warning ("Cannot revoke one-shot auth: %s: %s", 
+                                        kit_warning ("Cannot revoke one-shot auth: %s: %s", 
                                                    polkit_error_get_error_name (error),
                                                    polkit_error_get_error_message (error));
                                         polkit_error_free (error);
@@ -798,11 +789,10 @@ polkit_authorization_db_revoke_entry (PolKitAuthorizationDB *authdb,
                                       PolKitAuthorization   *auth,
                                       PolKitError           **error)
 {
-        GError *g_error;
         char *helper_argv[] = {PACKAGE_LIBEXEC_DIR "/polkit-revoke-helper", "", NULL, NULL, NULL};
         const char *auth_file_entry;
-        gboolean ret;
-        gint exit_status;
+        polkit_bool_t ret;
+        int exit_status;
 
         ret = FALSE;
 
@@ -816,27 +806,21 @@ polkit_authorization_db_revoke_entry (PolKitAuthorizationDB *authdb,
         helper_argv[2] = "uid";
         helper_argv[3] = kit_strdup_printf ("%d", polkit_authorization_get_uid (auth));
 
-        g_error = NULL;
-        if (!g_spawn_sync (NULL,         /* const gchar *working_directory */
-                           helper_argv,  /* gchar **argv */
-                           NULL,         /* gchar **envp */
-                           0,            /* GSpawnFlags flags */
-                           NULL,         /* GSpawnChildSetupFunc child_setup */
-                           NULL,         /* gpointer user_data */
-                           NULL,         /* gchar **standard_output */
-                           NULL,         /* gchar **standard_error */
-                           &exit_status, /* gint *exit_status */
-                           &g_error)) {  /* GError **error */
+        if (!kit_spawn_sync (NULL,             /* const char  *working_directory */
+                             helper_argv,      /* char       **argv */
+                             NULL,             /* char       **envp */
+                             NULL,             /* char        *stdin */
+                             NULL,             /* char       **stdout */
+                             NULL,             /* char       **stderr */
+                             &exit_status)) {  /* int         *exit_status */
                 polkit_error_set_error (error, 
                                         POLKIT_ERROR_GENERAL_ERROR, 
-                                        "Error spawning revoke helper: %s",
-                                        g_error->message);
-                g_error_free (g_error);
+                                        "Error spawning revoke helper: %m");
                 goto out;
         }
 
         if (!WIFEXITED (exit_status)) {
-                g_warning ("Revoke helper crashed!");
+                kit_warning ("Revoke helper crashed!");
                 polkit_error_set_error (error, 
                                         POLKIT_ERROR_GENERAL_ERROR, 
                                         "Revoke helper crashed!");


More information about the hal-commit mailing list