From 3ad8ed87726d5c3a6a9f15a5c2dce2ce8aca06b6 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Fri, 17 Oct 2014 08:34:24 +0200 Subject: pam_succeed_if: Use long long type for numeric values The currently used long with additional conversion to int is too small for uids and gids. modules/pam_succeed_if/pam_succeed_if.c (evaluate_num): Replace strtol() with strtoll() and int with long long in the parameters of comparison functions. --- modules/pam_succeed_if/pam_succeed_if.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'modules') diff --git a/modules/pam_succeed_if/pam_succeed_if.c b/modules/pam_succeed_if/pam_succeed_if.c index 32a73738..98a84745 100644 --- a/modules/pam_succeed_if/pam_succeed_if.c +++ b/modules/pam_succeed_if/pam_succeed_if.c @@ -68,20 +68,20 @@ * PAM_SERVICE_ERR if the arguments can't be parsed as numbers. */ static int evaluate_num(const pam_handle_t *pamh, const char *left, - const char *right, int (*cmp)(int, int)) + const char *right, int (*cmp)(long long, long long)) { - long l, r; + long long l, r; char *p; int ret = PAM_SUCCESS; errno = 0; - l = strtol(left, &p, 0); + l = strtoll(left, &p, 0); if ((p == NULL) || (*p != '\0') || errno) { pam_syslog(pamh, LOG_INFO, "\"%s\" is not a number", left); ret = PAM_SERVICE_ERR; } - r = strtol(right, &p, 0); + r = strtoll(right, &p, 0); if ((p == NULL) || (*p != '\0') || errno) { pam_syslog(pamh, LOG_INFO, "\"%s\" is not a number", right); ret = PAM_SERVICE_ERR; @@ -96,32 +96,32 @@ evaluate_num(const pam_handle_t *pamh, const char *left, /* Simple numeric comparison callbacks. */ static int -eq(int i, int j) +eq(long long i, long long j) { return i == j; } static int -ne(int i, int j) +ne(long long i, long long j) { return i != j; } static int -lt(int i, int j) +lt(long long i, long long j) { return i < j; } static int -le(int i, int j) +le(long long i, long long j) { return lt(i, j) || eq(i, j); } static int -gt(int i, int j) +gt(long long i, long long j) { return i > j; } static int -ge(int i, int j) +ge(long long i, long long j) { return gt(i, j) || eq(i, j); } -- cgit v1.2.3