about summary refs log tree commit diff
path: root/src/nm-manager-auth.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/nm-manager-auth.h')
-rw-r--r--src/nm-manager-auth.h26
1 files changed, 11 insertions, 15 deletions
diff --git a/src/nm-manager-auth.h b/src/nm-manager-auth.h
index 15317c71..43dd6398 100644
--- a/src/nm-manager-auth.h
+++ b/src/nm-manager-auth.h
@@ -27,6 +27,7 @@
 #include <nm-connection.h>
 #include "nm-dbus-manager.h"
 #include "nm-session-monitor.h"
+#include "nm-auth-subject.h"
 
 #define NM_AUTH_PERMISSION_ENABLE_DISABLE_NETWORK     "org.freedesktop.NetworkManager.enable-disable-network"
 #define NM_AUTH_PERMISSION_SLEEP_WAKE                 "org.freedesktop.NetworkManager.sleep-wake"
@@ -55,19 +56,20 @@ typedef void (*NMAuthChainResultFunc) (NMAuthChain *chain,
                                        DBusGMethodInvocation *context,
                                        gpointer user_data);
 
-NMAuthChain *nm_auth_chain_new (DBusGMethodInvocation *context,
-                                DBusGProxy *proxy,
-                                NMAuthChainResultFunc done_func,
-                                gpointer user_data);
-
-NMAuthChain *nm_auth_chain_new_raw_message (DBusMessage *message,
-                                            NMAuthChainResultFunc done_func,
-                                            gpointer user_data);
-
 NMAuthChain *nm_auth_chain_new_dbus_sender (const char *dbus_sender,
+                                            gulong user_uid,
                                             NMAuthChainResultFunc done_func,
                                             gpointer user_data);
 
+NMAuthChain *nm_auth_chain_new_context (DBusGMethodInvocation *context,
+                                        NMAuthChainResultFunc done_func,
+                                        gpointer user_data);
+
+NMAuthChain *nm_auth_chain_new_subject (NMAuthSubject *subject,
+                                        DBusGMethodInvocation *context,
+                                        NMAuthChainResultFunc done_func,
+                                        gpointer user_data);
+
 gpointer nm_auth_chain_get_data (NMAuthChain *chain, const char *tag);
 
 gpointer nm_auth_chain_steal_data (NMAuthChain *chain, const char *tag);
@@ -92,12 +94,6 @@ gboolean nm_auth_chain_add_call (NMAuthChain *chain,
 
 void nm_auth_chain_unref (NMAuthChain *chain);
 
-/* Utils */
-gboolean nm_auth_get_caller_uid (DBusGMethodInvocation *context,
-                                 NMDBusManager *dbus_mgr,
-                                 gulong *out_uid,
-                                 char **out_error_desc);
-
 /* Caller must free returned error description */
 gboolean nm_auth_uid_in_acl (NMConnection *connection,
                              NMSessionMonitor *smon,