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: Throw a NoEnrolledPrints error if trying to delete a device with no prints

Browse Source 
Adjust tests accordingly
This commit is contained in:
Marco Trevisan (Treviño)
2021-01-27 22:47:09 +01:00
parent 4b246d3ce2
commit 6f355797f8
4 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/device.c
View File

@ -1985,9 +1985,14 @@ delete_enrolled_fingers (FprintDevice *rdev,
if (!user_has_print_enrolled (rdev, user, finger))
{
g_set_error (error, FPRINT_ERROR, FPRINT_ERROR_NO_ENROLLED_PRINTS,
"Fingerprint for finger %s is not enrolled",
fp_finger_to_name (finger));
if (finger != FP_FINGER_UNKNOWN)
g_set_error (error, FPRINT_ERROR, FPRINT_ERROR_NO_ENROLLED_PRINTS,
"Fingerprint for finger %s is not enrolled",
fp_finger_to_name (finger));
else
g_set_error_literal (error, FPRINT_ERROR, FPRINT_ERROR_NO_ENROLLED_PRINTS,
"No fingerprint enrolled");
return FALSE;
}
@ -2192,11 +2197,8 @@ fprint_device_delete_enrolled_fingers (FprintDBusDevice *dbus_dev,
if (!opened && fp_device_has_storage (priv->dev))
fp_device_close_sync (priv->dev, NULL, NULL);
if (error &&
!g_error_matches (error, FPRINT_ERROR, FPRINT_ERROR_NO_ENROLLED_PRINTS))
if (error)
{
/* FIXME: We should probably expose NoEnrolledPrints as an actual error,
* but not changing the API for now */
g_dbus_method_invocation_return_gerror (invocation,
error);
return TRUE;
@ -2237,14 +2239,8 @@ fprint_device_delete_enrolled_fingers2 (FprintDBusDevice *dbus_dev,
if (!delete_enrolled_fingers (rdev, session->username, FP_FINGER_UNKNOWN, &error))
{
if (!g_error_matches (error, FPRINT_ERROR, FPRINT_ERROR_NO_ENROLLED_PRINTS))
{
/* FIXME: We should probably expose NoEnrolledPrints as an actual error,
* but not changing the API for now */
g_dbus_method_invocation_return_gerror (invocation,
error);
return TRUE;
}
g_dbus_method_invocation_return_gerror (invocation, error);
return TRUE;
}
fprint_dbus_device_complete_delete_enrolled_fingers2 (dbus_dev,