summary refs log tree commit diff
path: root/src/nm-auth-manager.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/nm-auth-manager.h')
-rw-r--r--src/nm-auth-manager.h62
1 files changed, 16 insertions, 46 deletions
diff --git a/src/nm-auth-manager.h b/src/nm-auth-manager.h
index fe7ee787..e66ef78c 100644
--- a/src/nm-auth-manager.h
+++ b/src/nm-auth-manager.h
@@ -23,31 +23,6 @@
 
 #include "nm-auth-subject.h"
 
-/*****************************************************************************/
-
-typedef enum {
-	NM_AUTH_CALL_RESULT_UNKNOWN,
-	NM_AUTH_CALL_RESULT_YES,
-	NM_AUTH_CALL_RESULT_AUTH,
-	NM_AUTH_CALL_RESULT_NO,
-} NMAuthCallResult;
-
-static inline NMAuthCallResult
-nm_auth_call_result_eval (gboolean is_authorized,
-                          gboolean is_challenge,
-                          GError *error)
-{
-	if (error)
-		return NM_AUTH_CALL_RESULT_UNKNOWN;
-	if (is_authorized)
-		return NM_AUTH_CALL_RESULT_YES;
-	if (is_challenge)
-		return NM_AUTH_CALL_RESULT_AUTH;
-	return NM_AUTH_CALL_RESULT_NO;
-}
-
-/*****************************************************************************/
-
 #define NM_TYPE_AUTH_MANAGER            (nm_auth_manager_get_type ())
 #define NM_AUTH_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_AUTH_MANAGER, NMAuthManager))
 #define NM_AUTH_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_AUTH_MANAGER, NMAuthManagerClass))
@@ -67,28 +42,23 @@ GType nm_auth_manager_get_type (void);
 NMAuthManager *nm_auth_manager_setup (gboolean polkit_enabled);
 NMAuthManager *nm_auth_manager_get (void);
 
-void nm_auth_manager_force_shutdown (NMAuthManager *self);
-
 gboolean nm_auth_manager_get_polkit_enabled (NMAuthManager *self);
 
-/*****************************************************************************/
-
-typedef struct _NMAuthManagerCallId NMAuthManagerCallId;
-
-typedef void (*NMAuthManagerCheckAuthorizationCallback) (NMAuthManager *self,
-                                                         NMAuthManagerCallId *call_id,
-                                                         gboolean is_authorized,
-                                                         gboolean is_challenge,
-                                                         GError *error,
-                                                         gpointer user_data);
-
-NMAuthManagerCallId *nm_auth_manager_check_authorization (NMAuthManager *self,
-                                                          NMAuthSubject *subject,
-                                                          const char *action_id,
-                                                          gboolean allow_user_interaction,
-                                                          NMAuthManagerCheckAuthorizationCallback callback,
-                                                          gpointer user_data);
-
-void nm_auth_manager_check_authorization_cancel (NMAuthManagerCallId *call_id);
+#if WITH_POLKIT
+
+void nm_auth_manager_polkit_authority_check_authorization (NMAuthManager *self,
+                                                           NMAuthSubject *subject,
+                                                           const char *action_id,
+                                                           gboolean allow_user_interaction,
+                                                           GCancellable *cancellable,
+                                                           GAsyncReadyCallback callback,
+                                                           gpointer user_data);
+gboolean nm_auth_manager_polkit_authority_check_authorization_finish (NMAuthManager *self,
+                                                                      GAsyncResult *res,
+                                                                      gboolean *out_is_authorized,
+                                                                      gboolean *out_is_challenge,
+                                                                      GError **error);
+
+#endif
 
 #endif /* NM_AUTH_MANAGER_H */