a6acced551
- There's one more commit after version 0.2 on github. After that, the software discontinued. This version is adopted by Debian - added alocal/automake - Committed with changed (added IGNORE for FreeBSD < 8.x since libusb 1.0 is needed, see libfprint) PR: 161225 Submitted by: Zhihao Yuan <lichray@gmail.com> Approved by: ports (maintainer timeout) gabor (mentor) Feature safe: yes
65 lines
1.6 KiB
C
65 lines
1.6 KiB
C
--- src/pam_fprint.c.orig 2009-01-08 15:31:21.000000000 -0600
|
|
+++ src/pam_fprint.c 2011-11-13 02:14:44.221692989 -0600
|
|
@@ -18,15 +18,17 @@
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
+#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <pwd.h>
|
|
#include <string.h>
|
|
|
|
-#include <fprint.h>
|
|
+#include "libfprint/fprint.h"
|
|
|
|
#define PAM_SM_AUTH
|
|
#include <security/pam_modules.h>
|
|
+#include <security/pam_appl.h>
|
|
|
|
static int send_info_msg(pam_handle_t *pamh, char *msg)
|
|
{
|
|
@@ -41,10 +43,10 @@ static int send_info_msg(pam_handle_t *p
|
|
|
|
r = pam_get_item(pamh, PAM_CONV, (const void **) &pc);
|
|
if (r != PAM_SUCCESS)
|
|
- return;
|
|
+ return r;
|
|
|
|
if (!pc || !pc->conv)
|
|
- return;
|
|
+ return PAM_BUF_ERR;
|
|
|
|
return pc->conv(1, &msgp, &resp, pc->appdata_ptr);
|
|
}
|
|
@@ -62,10 +64,10 @@ static int send_err_msg(pam_handle_t *pa
|
|
|
|
r = pam_get_item(pamh, PAM_CONV, (const void **) &pc);
|
|
if (r != PAM_SUCCESS)
|
|
- return;
|
|
+ return r;
|
|
|
|
if (!pc || !pc->conv)
|
|
- return;
|
|
+ return PAM_BUF_ERR;
|
|
|
|
return pc->conv(1, &msgp, &resp, pc->appdata_ptr);
|
|
}
|
|
@@ -102,7 +104,7 @@ static struct fp_print_data **find_dev_a
|
|
struct fp_print_data **gallery;
|
|
|
|
/* TODO: add device selection */
|
|
- while (print = prints[i++]) {
|
|
+ while ((print = prints[i++])) {
|
|
if (!ddev) {
|
|
ddev = fp_dscv_dev_for_dscv_print(ddevs, print);
|
|
driver_id = fp_dscv_print_get_driver_id(print);
|
|
@@ -133,7 +135,7 @@ static struct fp_print_data **find_dev_a
|
|
}
|
|
|
|
i = 0, j = 0;
|
|
- while (print = prints[i++]) {
|
|
+ while ((print = prints[i++])) {
|
|
driver_id_cur = fp_dscv_print_get_driver_id(print);
|
|
if (driver_id_cur == driver_id) {
|
|
err = fp_print_data_from_dscv_print(print, & (gallery[j]));
|