Imported Upstream version 1.40

[platform/upstream/connman.git] / plugins / polkit.c

diff --git a/plugins/polkit.c b/plugins/polkit.c
index bff357f..ae38364 100644 (file)
--- a/plugins/polkit.c
+++ b/plugins/polkit.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2008  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -23,105 +23,33 @@
 #include <config.h>
 #endif
 
-#include <errno.h>
-
-#include <glib.h>
-#include <polkit-dbus/polkit-dbus.h>
+#include <gdbus.h>
 
+#define CONNMAN_API_SUBJECT_TO_CHANGE
 #include <connman/plugin.h>
-#include <connman/security.h>
-#include <connman/log.h>
-
-static PolKitContext *polkit_context = NULL;
-
-static int polkit_authorize(const char *sender)
-{
-       DBG("sender %s", sender);
-
-       return -EPERM;
-}
-
-static struct connman_security polkit_security = {
-       .name                   = "polkit",
-       .authorize_sender       = polkit_authorize,
+#include <connman/dbus.h>
+
+static const GDBusSecurityTable polkit_security[] = {
+       { CONNMAN_PRIVILEGE_MODIFY, "net.connman.modify",
+                               G_DBUS_SECURITY_FLAG_BUILTIN |
+                               G_DBUS_SECURITY_FLAG_ALLOW_INTERACTION },
+       { CONNMAN_PRIVILEGE_SECRET, "net.connman.secret",
+                               G_DBUS_SECURITY_FLAG_BUILTIN |
+                               G_DBUS_SECURITY_FLAG_ALLOW_INTERACTION },
+       { }
 };
 
-static gboolean watch_event(GIOChannel *channel, GIOCondition condition,
-                                                       gpointer user_data)
-{
-       PolKitContext *context = user_data;
-       int fd;
-
-       DBG("context %p", context);
-
-       fd = g_io_channel_unix_get_fd(channel);
-
-       polkit_context_io_func(context, fd);
-
-       return TRUE;
-}
-
-static int add_watch(PolKitContext *context, int fd)
-{
-       GIOChannel *channel;
-       guint id = 0;
-
-       DBG("context %p", context);
-
-       channel = g_io_channel_unix_new(fd);
-       if (channel == NULL)
-               return 0;
-
-       id = g_io_add_watch(channel, G_IO_IN, watch_event, context);
-
-       g_io_channel_unref(channel);
-
-       return id;
-}
-
-static void remove_watch(PolKitContext *context, int id)
-{
-       DBG("context %p", context);
-
-       g_source_remove(id);
-}
-
 static int polkit_init(void)
 {
-       int err;
-
-       polkit_context = polkit_context_new();
-
-       polkit_context_set_io_watch_functions(polkit_context,
-                                               add_watch, remove_watch);
-
-       if (polkit_context_init(polkit_context, NULL) == FALSE) {
-               connman_error("Can't initialize PolicyKit");
-               polkit_context_unref(polkit_context);
-               polkit_context = NULL;
-               return -EIO;
-       }
-
-       err = connman_security_register(&polkit_security);
-       if (err < 0) {
-               polkit_context_unref(polkit_context);
-               polkit_context = NULL;
-               return err;
-       }
+       g_dbus_register_security(polkit_security);
 
        return 0;
 }
 
 static void polkit_exit(void)
 {
-       connman_security_unregister(&polkit_security);
-
-       if (polkit_context == NULL)
-               return;
-
-       polkit_context_unref(polkit_context);
-       polkit_context = NULL;
+       g_dbus_unregister_security(polkit_security);
 }
 
-CONNMAN_PLUGIN_DEFINE("polkit", "PolicyKit authorization plugin", VERSION,
-                                               polkit_init, polkit_exit)
+CONNMAN_PLUGIN_DEFINE(polkit, "PolicyKit authorization plugin", VERSION,
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, polkit_init, polkit_exit)