mirror of
https://gitlab.com/mishakmak/pam-fprint-grosshack.git
synced 2026-04-08 20:03:34 +02:00
Don't error out when there's no fingerprints
Instead, print out some information about the device, and carry on to the next one.
This commit is contained in:
committed by
Daniel Drake
parent
6f69aef553
commit
af5b8a6e37
16
tests/list.c
16
tests/list.c
@ -47,12 +47,11 @@ static void list_fingerprints(DBusGProxy *dev, const char *username)
|
|||||||
DBusGProxy *p;
|
DBusGProxy *p;
|
||||||
guint i;
|
guint i;
|
||||||
|
|
||||||
if (!net_reactivated_Fprint_Device_list_enrolled_fingers(dev, username, &fingers, &error))
|
if (!net_reactivated_Fprint_Device_list_enrolled_fingers(dev, username, &fingers, &error)) {
|
||||||
g_error("ListEnrolledFingers failed: %s", error->message);
|
if (dbus_g_error_has_name (error, "net.reactivated.Fprint.Error.NoEnrolledPrints") == FALSE)
|
||||||
|
g_error("ListEnrolledFingers failed: %s", error->message);
|
||||||
if (fingers == NULL || g_strv_length (fingers) == 0) {
|
else
|
||||||
g_print("User %s has no fingers enrolled for this device.\n", username);
|
fingers = NULL;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
p = dbus_g_proxy_new_from_proxy(dev, "org.freedesktop.DBus.Properties", NULL);
|
p = dbus_g_proxy_new_from_proxy(dev, "org.freedesktop.DBus.Properties", NULL);
|
||||||
@ -60,6 +59,11 @@ static void list_fingerprints(DBusGProxy *dev, const char *username)
|
|||||||
dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props, G_TYPE_INVALID))
|
dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props, G_TYPE_INVALID))
|
||||||
g_error("GetAll on the Properties interface failed: %s", error->message);
|
g_error("GetAll on the Properties interface failed: %s", error->message);
|
||||||
|
|
||||||
|
if (fingers == NULL || g_strv_length (fingers) == 0) {
|
||||||
|
g_print("User %s has no fingers enrolled for %s.\n", username, g_value_get_string (g_hash_table_lookup (props, "name")));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
g_print("Fingerprints for user %s on %s (%s):\n",
|
g_print("Fingerprints for user %s on %s (%s):\n",
|
||||||
username,
|
username,
|
||||||
g_value_get_string (g_hash_table_lookup (props, "name")),
|
g_value_get_string (g_hash_table_lookup (props, "name")),
|
||||||
|
|||||||
Reference in New Issue
Block a user