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

bump 1.94.2

Browse Source
This commit is contained in:
Animesh Sahu
2022-05-20 14:39:27 +05:30
parent d7244b9d58
commit e39cf86d33
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -1,5 +1,5 @@
project('fprintd', 'c', project('fprintd', 'c',
version: '1.94.1', version: '1.94.2',
license: 'GPLv2+', license: 'GPLv2+',
default_options: [ default_options: [
'buildtype=debugoptimized', 'buildtype=debugoptimized',
@ -154,7 +154,7 @@ python3_available_modules = []
foreach module, required : python3_test_modules foreach module, required : python3_test_modules
if required and run_command(python3, '-c', 'import @0@'.format(module)).returncode() != 0 if required and run_command(python3, '-c', 'import @0@'.format(module)).returncode() != 0
error('Python3 module \'' + module + '\' required by test suite not found') warning('Python3 module \'' + module + '\' required by test suite not found')
endif endif
endforeach endforeach

12
pam/pam_fprintd.c
View File

@ -22,6 +22,7 @@
#include <security/_pam_types.h> #include <security/_pam_types.h>
#define _GNU_SOURCE #define _GNU_SOURCE
#include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
@ -460,7 +461,10 @@ do_verify (sd_bus *bus, verify_data *data)
while (data->max_tries > 0) while (data->max_tries > 0)
{ {
uint64_t verification_end = now () + (timeout * USEC_PER_SEC); uint64_t verification_end = ULONG_MAX;
if (timeout != UINT_MAX)
verification_end = now () + (timeout * USEC_PER_SEC);
data->timed_out = false; data->timed_out = false;
data->verify_started = false; data->verify_started = false;
@ -874,7 +878,8 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc,
} }
else if (str_has_prefix (argv[i], MAX_TRIES_MATCH) && strlen (argv[i]) > strlen (MAX_TRIES_MATCH)) else if (str_has_prefix (argv[i], MAX_TRIES_MATCH) && strlen (argv[i]) > strlen (MAX_TRIES_MATCH))
{ {
max_tries = atoi (argv[i] + strlen (MAX_TRIES_MATCH)); int opt_max_tries = atoi (argv[i] + strlen (MAX_TRIES_MATCH));
max_tries = (opt_max_tries < 0 ? UINT_MAX : (unsigned) opt_max_tries);
if (max_tries < 1) if (max_tries < 1)
{ {
if (debug) if (debug)
@ -887,7 +892,8 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc,
} }
else if (str_has_prefix (argv[i], TIMEOUT_MATCH) && strlen (argv[i]) <= strlen (TIMEOUT_MATCH) + 2) else if (str_has_prefix (argv[i], TIMEOUT_MATCH) && strlen (argv[i]) <= strlen (TIMEOUT_MATCH) + 2)
{ {
timeout = atoi (argv[i] + strlen (TIMEOUT_MATCH)); int opt_timeout = atoi (argv[i] + strlen (TIMEOUT_MATCH));
timeout = (opt_timeout < 0 ? UINT_MAX : (unsigned) opt_timeout);
if (timeout < MIN_TIMEOUT) if (timeout < MIN_TIMEOUT)
{ {
if (debug) if (debug)