diff options
| author | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 21:23:37 -0800 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 22:11:51 -0800 |
| commit | 7e6c4749370338c9af7e1b959f8ab96d089786d6 (patch) | |
| tree | 2da5e702d7da7b222237ea5ac71e208dd70791a6 /libpam/pam_modutil_getgrgid.c | |
| parent | fa4960114fc50965a9696f2db7406a9d792e3ff8 (diff) | |
| parent | 795badba7f95e737f979917859cd32c9bd47bcad (diff) | |
| download | pam-7e6c4749370338c9af7e1b959f8ab96d089786d6.tar.gz pam-7e6c4749370338c9af7e1b959f8ab96d089786d6.tar.bz2 pam-7e6c4749370338c9af7e1b959f8ab96d089786d6.zip | |
Merge upstream version 1.1.8
Diffstat (limited to 'libpam/pam_modutil_getgrgid.c')
| -rw-r--r-- | libpam/pam_modutil_getgrgid.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libpam/pam_modutil_getgrgid.c b/libpam/pam_modutil_getgrgid.c index fb7ced84..386d6f4b 100644 --- a/libpam/pam_modutil_getgrgid.c +++ b/libpam/pam_modutil_getgrgid.c @@ -1,5 +1,5 @@ /* - * $Id: pam_modutil_getgrgid.c,v 1.3 2008/05/14 12:55:02 t8m Exp $ + * $Id$ * * This function provides a thread safer version of getgrgid() for use * with PAM modules that care about this sort of thing. @@ -16,7 +16,7 @@ #include <stdlib.h> static int intlen(int number) -{ +{ int len = 2; while (number != 0) { number /= 10; @@ -26,7 +26,7 @@ static int intlen(int number) } static int longlen(long number) -{ +{ int len = 2; while (number != 0) { number /= 10; @@ -72,7 +72,7 @@ pam_modutil_getgrgid(pam_handle_t *pamh, gid_t gid) int i; data_name = malloc(strlen("_pammodutil_getgrgid") + 1 + - longlen((long)gid) + 1 + intlen(INT_MAX) + 1); + longlen((long)gid) + 1 + intlen(INT_MAX) + 1); if ((pamh != NULL) && (data_name == NULL)) { D(("was unable to register the data item [%s]", pam_strerror(pamh, status))); @@ -83,7 +83,7 @@ pam_modutil_getgrgid(pam_handle_t *pamh, gid_t gid) if (pamh != NULL) { for (i = 0; i < INT_MAX; i++) { sprintf(data_name, "_pammodutil_getgrgid_%ld_%d", - (long) gid, i); + (long) gid, i); status = PAM_NO_MODULE_DATA; if (pam_get_data(pamh, data_name, &ignore) != PAM_SUCCESS) { status = pam_set_data(pamh, data_name, @@ -114,7 +114,7 @@ pam_modutil_getgrgid(pam_handle_t *pamh, gid_t gid) /* no sense in repeating the call */ break; } - + length <<= PWD_LENGTH_SHIFT; } while (length < PWD_ABSURD_PWD_LENGTH); @@ -131,7 +131,7 @@ pam_modutil_getgrgid(pam_handle_t *pamh, gid_t gid) * Sorry, there does not appear to be a reentrant version of * getgrgid(). So, we use the standard libc function. */ - + return getgrgid(gid); #endif /* def HAVE_GETGRGID_R */ |