|
 |
c22a38 |
diff -up Linux-PAM-1.1.8/modules/pam_succeed_if/pam_succeed_if.c.large-uid Linux-PAM-1.1.8/modules/pam_succeed_if/pam_succeed_if.c
|
|
|
c22a38 |
--- Linux-PAM-1.1.8/modules/pam_succeed_if/pam_succeed_if.c.large-uid 2013-06-18 16:11:21.000000000 +0200
|
|
|
c22a38 |
+++ Linux-PAM-1.1.8/modules/pam_succeed_if/pam_succeed_if.c 2016-07-19 15:00:57.366549150 +0200
|
|
|
c22a38 |
@@ -68,20 +68,20 @@
|
|
|
c22a38 |
* PAM_SERVICE_ERR if the arguments can't be parsed as numbers. */
|
|
|
c22a38 |
static int
|
|
|
c22a38 |
evaluate_num(const pam_handle_t *pamh, const char *left,
|
|
|
c22a38 |
- const char *right, int (*cmp)(int, int))
|
|
|
c22a38 |
+ const char *right, int (*cmp)(long long, long long))
|
|
|
c22a38 |
{
|
|
|
c22a38 |
- long l, r;
|
|
|
c22a38 |
+ long long l, r;
|
|
|
c22a38 |
char *p;
|
|
|
c22a38 |
int ret = PAM_SUCCESS;
|
|
|
c22a38 |
|
|
|
c22a38 |
errno = 0;
|
|
|
c22a38 |
- l = strtol(left, &p, 0);
|
|
|
c22a38 |
+ l = strtoll(left, &p, 0);
|
|
|
c22a38 |
if ((p == NULL) || (*p != '\0') || errno) {
|
|
|
c22a38 |
pam_syslog(pamh, LOG_INFO, "\"%s\" is not a number", left);
|
|
|
c22a38 |
ret = PAM_SERVICE_ERR;
|
|
|
c22a38 |
}
|
|
|
c22a38 |
|
|
|
c22a38 |
- r = strtol(right, &p, 0);
|
|
|
c22a38 |
+ r = strtoll(right, &p, 0);
|
|
|
c22a38 |
if ((p == NULL) || (*p != '\0') || errno) {
|
|
|
c22a38 |
pam_syslog(pamh, LOG_INFO, "\"%s\" is not a number", right);
|
|
|
c22a38 |
ret = PAM_SERVICE_ERR;
|
|
|
c22a38 |
@@ -96,32 +96,32 @@ evaluate_num(const pam_handle_t *pamh, c
|
|
|
c22a38 |
|
|
|
c22a38 |
/* Simple numeric comparison callbacks. */
|
|
|
c22a38 |
static int
|
|
|
c22a38 |
-eq(int i, int j)
|
|
|
c22a38 |
+eq(long long i, long long j)
|
|
|
c22a38 |
{
|
|
|
c22a38 |
return i == j;
|
|
|
c22a38 |
}
|
|
|
c22a38 |
static int
|
|
|
c22a38 |
-ne(int i, int j)
|
|
|
c22a38 |
+ne(long long i, long long j)
|
|
|
c22a38 |
{
|
|
|
c22a38 |
return i != j;
|
|
|
c22a38 |
}
|
|
|
c22a38 |
static int
|
|
|
c22a38 |
-lt(int i, int j)
|
|
|
c22a38 |
+lt(long long i, long long j)
|
|
|
c22a38 |
{
|
|
|
c22a38 |
return i < j;
|
|
|
c22a38 |
}
|
|
|
c22a38 |
static int
|
|
|
c22a38 |
-le(int i, int j)
|
|
|
c22a38 |
+le(long long i, long long j)
|
|
|
c22a38 |
{
|
|
|
c22a38 |
return lt(i, j) || eq(i, j);
|
|
|
c22a38 |
}
|
|
|
c22a38 |
static int
|
|
|
c22a38 |
-gt(int i, int j)
|
|
|
c22a38 |
+gt(long long i, long long j)
|
|
|
c22a38 |
{
|
|
|
c22a38 |
return i > j;
|
|
|
c22a38 |
}
|
|
|
c22a38 |
static int
|
|
|
c22a38 |
-ge(int i, int j)
|
|
|
c22a38 |
+ge(long long i, long long j)
|
|
|
c22a38 |
{
|
|
|
c22a38 |
return gt(i, j) || eq(i, j);
|
|
|
c22a38 |
}
|
|
|
c22a38 |
@@ -298,7 +298,7 @@ evaluate(pam_handle_t *pamh, int debug,
|
|
|
c22a38 |
}
|
|
|
c22a38 |
if (strcasecmp(left, "rhost") == 0) {
|
|
|
c22a38 |
const void *rhost;
|
|
|
c22a38 |
- if (pam_get_item(pamh, PAM_SERVICE, &rhost) != PAM_SUCCESS ||
|
|
|
c22a38 |
+ if (pam_get_item(pamh, PAM_RHOST, &rhost) != PAM_SUCCESS ||
|
|
|
c22a38 |
rhost == NULL)
|
|
|
c22a38 |
rhost = "";
|
|
|
c22a38 |
snprintf(buf, sizeof(buf), "%s", (const char *)rhost);
|
|
|
c22a38 |
@@ -306,7 +306,7 @@ evaluate(pam_handle_t *pamh, int debug,
|
|
|
c22a38 |
}
|
|
|
c22a38 |
if (strcasecmp(left, "tty") == 0) {
|
|
|
c22a38 |
const void *tty;
|
|
|
c22a38 |
- if (pam_get_item(pamh, PAM_SERVICE, &tty) != PAM_SUCCESS ||
|
|
|
c22a38 |
+ if (pam_get_item(pamh, PAM_TTY, &tty) != PAM_SUCCESS ||
|
|
|
c22a38 |
tty == NULL)
|
|
|
c22a38 |
tty = "";
|
|
|
c22a38 |
snprintf(buf, sizeof(buf), "%s", (const char *)tty);
|