diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-12-05 15:20:18 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-12-10 07:53:25 +0100 |
| commit | 33754752ea88f4717037801ee38652b392294efa (patch) | |
| tree | cf6021adad2f9fbe409a5da2013039e217442df4 | |
| parent | 466a4c45625a3726e45e219f5f9185a7dc0a3111 (diff) | |
| download | NetworkManager-33754752ea88f4717037801ee38652b392294efa.tar.gz | |
core: use nm_client_permission_result_to_string() to map permission result
In NetworkManager we have NMAuthCallResult, which is really a duplicate
of NMClientPermissionResult.
Maybe NMAuthCallResult should be entirely replaced by NMClientPermissionResult.
But the name NMClientPermissionResult is a bit awkward. But then the
duplication is even more awkward... fixing this is left for another day.
| -rw-r--r-- | src/nm-auth-manager.h | 14 | ||||
| -rw-r--r-- | src/nm-manager.c | 13 |
2 files changed, 13 insertions, 14 deletions
diff --git a/src/nm-auth-manager.h b/src/nm-auth-manager.h index 083f98aaaa..3e3124cacb 100644 --- a/src/nm-auth-manager.h +++ b/src/nm-auth-manager.h @@ -11,12 +11,18 @@ /*****************************************************************************/ typedef enum { - NM_AUTH_CALL_RESULT_UNKNOWN, - NM_AUTH_CALL_RESULT_YES, - NM_AUTH_CALL_RESULT_AUTH, - NM_AUTH_CALL_RESULT_NO, + NM_AUTH_CALL_RESULT_UNKNOWN = NM_CLIENT_PERMISSION_RESULT_UNKNOWN, + NM_AUTH_CALL_RESULT_YES = NM_CLIENT_PERMISSION_RESULT_YES, + NM_AUTH_CALL_RESULT_AUTH = NM_CLIENT_PERMISSION_RESULT_AUTH, + NM_AUTH_CALL_RESULT_NO = NM_CLIENT_PERMISSION_RESULT_NO, } NMAuthCallResult; +static inline NMClientPermissionResult +nm_auth_call_result_to_client (NMAuthCallResult result) +{ + return (NMClientPermissionResult) result; +} + static inline NMAuthCallResult nm_auth_call_result_eval (gboolean is_authorized, gboolean is_challenge, diff --git a/src/nm-manager.c b/src/nm-manager.c index 0adde3fc39..808c6538cf 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -6215,18 +6215,11 @@ get_permissions_done_cb (NMAuthChain *chain, for (i = 0; i < (int) G_N_ELEMENTS (nm_auth_permission_sorted); i++) { const char *permission = nm_auth_permission_names_by_idx[nm_auth_permission_sorted[i] - 1]; NMAuthCallResult result; + const char *result_str; result = nm_auth_chain_get_result (chain, permission); - if (result == NM_AUTH_CALL_RESULT_YES) - g_variant_builder_add (&results, "{ss}", permission, "yes"); - else if (result == NM_AUTH_CALL_RESULT_NO) - g_variant_builder_add (&results, "{ss}", permission, "no"); - else if (result == NM_AUTH_CALL_RESULT_AUTH) - g_variant_builder_add (&results, "{ss}", permission, "auth"); - else if (result == NM_AUTH_CALL_RESULT_UNKNOWN) - g_variant_builder_add (&results, "{ss}", permission, "unknown"); - else - nm_assert_not_reached (); + result_str = nm_client_permission_result_to_string (nm_auth_call_result_to_client (result)); + g_variant_builder_add (&results, "{ss}", permission, result_str); } g_dbus_method_invocation_return_value (context, |