diff options
| author | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
| commit | cbb3b57b5b60dbf1eadb795c834ac511f5e1ba21 (patch) | |
| tree | a97e7cf8b8903a2902c34f586661a13da2a9f2ea /src/nm-auth-utils.h | |
| parent | 5ddbb9de1f57acaeb47a151404bcf5f8c9729276 (diff) | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Merge tag 'upstream/1.1.90' into experimental
Upstream version 1.1.90
Diffstat (limited to 'src/nm-auth-utils.h')
| -rw-r--r-- | src/nm-auth-utils.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/nm-auth-utils.h b/src/nm-auth-utils.h index 2ab026d0..6eb0fda0 100644 --- a/src/nm-auth-utils.h +++ b/src/nm-auth-utils.h @@ -21,11 +21,8 @@ #ifndef __NETWORKMANAGER_MANAGER_AUTH_H__ #define __NETWORKMANAGER_MANAGER_AUTH_H__ -#include <glib.h> -#include <dbus/dbus-glib.h> - #include <nm-connection.h> -#include "nm-types.h" +#include "nm-default.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" @@ -38,6 +35,7 @@ #define NM_AUTH_PERMISSION_SETTINGS_MODIFY_SYSTEM "org.freedesktop.NetworkManager.settings.modify.system" #define NM_AUTH_PERMISSION_SETTINGS_MODIFY_OWN "org.freedesktop.NetworkManager.settings.modify.own" #define NM_AUTH_PERMISSION_SETTINGS_MODIFY_HOSTNAME "org.freedesktop.NetworkManager.settings.modify.hostname" +#define NM_AUTH_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS "org.freedesktop.NetworkManager.settings.modify.global-dns" typedef struct NMAuthChain NMAuthChain; @@ -51,15 +49,15 @@ typedef enum { typedef void (*NMAuthChainResultFunc) (NMAuthChain *chain, GError *error, - DBusGMethodInvocation *context, + GDBusMethodInvocation *context, gpointer user_data); -NMAuthChain *nm_auth_chain_new_context (DBusGMethodInvocation *context, +NMAuthChain *nm_auth_chain_new_context (GDBusMethodInvocation *context, NMAuthChainResultFunc done_func, gpointer user_data); NMAuthChain *nm_auth_chain_new_subject (NMAuthSubject *subject, - DBusGMethodInvocation *context, + GDBusMethodInvocation *context, NMAuthChainResultFunc done_func, gpointer user_data); @@ -89,9 +87,10 @@ void nm_auth_chain_unref (NMAuthChain *chain); /* Caller must free returned error description */ gboolean nm_auth_is_subject_in_acl (NMConnection *connection, - NMSessionMonitor *smon, NMAuthSubject *subect, char **out_error_desc); +NMAuthSubject *nm_auth_chain_get_subject (NMAuthChain *self); + #endif /* __NETWORKMANAGER_MANAGER_AUTH_H__ */ |