cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-09 04:13:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

device: Add separate state for delete which will claim internally

Browse Source 
Also rename the different claim states to make them a bit more
understandable.
This commit is contained in:
Benjamin Berg
2020-12-03 20:32:21 +01:00
parent 7533f63a06
commit eac171ab0f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/device.c
View File

@ -65,7 +65,8 @@ typedef enum {
typedef enum { typedef enum {
STATE_CLAIMED, STATE_CLAIMED,
STATE_UNCLAIMED, STATE_UNCLAIMED,
STATE_IGNORED, STATE_AUTO_CLAIM,
STATE_ANYTIME,
} FprintDeviceClaimState; } FprintDeviceClaimState;
typedef struct { typedef struct {
@ -510,11 +511,9 @@ get_claim_state_for_invocation (GDBusMethodInvocation *invocation)
if (g_str_equal (method_name, "Claim")) { if (g_str_equal (method_name, "Claim")) {
return STATE_UNCLAIMED; return STATE_UNCLAIMED;
} else if (g_str_equal (method_name, "DeleteEnrolledFingers")) { } else if (g_str_equal (method_name, "DeleteEnrolledFingers")) {
if (g_object_get_qdata (G_OBJECT (invocation), quark_auth_user)) return STATE_AUTO_CLAIM;
return STATE_CLAIMED;
return STATE_IGNORED;
} else if (g_str_equal (method_name, "ListEnrolledFingers")) { } else if (g_str_equal (method_name, "ListEnrolledFingers")) {
return STATE_IGNORED; return STATE_ANYTIME;
} }
return STATE_CLAIMED; return STATE_CLAIMED;
@ -532,10 +531,12 @@ _fprint_device_check_claimed (FprintDevice *rdev,
requested_state = get_claim_state_for_invocation (invocation); requested_state = get_claim_state_for_invocation (invocation);
if (requested_state == STATE_IGNORED) if (requested_state == STATE_ANYTIME)
return TRUE; return TRUE;
session = session_data_get (priv); session = session_data_get (priv);
if (requested_state == STATE_AUTO_CLAIM)
requested_state = session ? STATE_CLAIMED : STATE_UNCLAIMED;
if (requested_state == STATE_UNCLAIMED) { if (requested_state == STATE_UNCLAIMED) {
/* Is it already claimed? */ /* Is it already claimed? */