diff options
| author | Dmitry V. Levin <ldv@strace.io> | 2023-12-12 08:00:00 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2023-12-12 20:05:08 +0000 |
| commit | cf492d0cedf10d4128c5cf211998dff2260acb6a (patch) | |
| tree | 8ba1eb14c454e6e24cf48e8dd5da22a0c3ce485c /libpam | |
| parent | f6a171e5c7bcb7c0bf56ea0dc81e3b6843670fc4 (diff) | |
| download | pam-cf492d0cedf10d4128c5cf211998dff2260acb6a.tar.gz pam-cf492d0cedf10d4128c5cf211998dff2260acb6a.tar.bz2 pam-cf492d0cedf10d4128c5cf211998dff2260acb6a.zip | |
treewide: assume getline exists
Apparently, getline is being used unconditionally in pam_namespace and
pam_sepermit. In pam_namespace, it is being used since 2006 when the
module was introduced in the first place.
Let's assume getline is universally available and let's use it
unconditionally in other cases, too.
* configure.ac (AC_CHECK_FUNCS): Remove getline and getdelim.
* libpam/pam_modutil_searchkey.c (pam_modutil_search_key): Use getline
unconditionally.
* modules/pam_pwhistory/opasswd.c (check_old_pass, save_old_pass):
Likewise.
* modules/pam_shells/pam_shells.c (perform_check): Likewise.
Diffstat (limited to 'libpam')
| -rw-r--r-- | libpam/pam_modutil_searchkey.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/libpam/pam_modutil_searchkey.c b/libpam/pam_modutil_searchkey.c index 6e577728..3d3be467 100644 --- a/libpam/pam_modutil_searchkey.c +++ b/libpam/pam_modutil_searchkey.c @@ -70,29 +70,8 @@ pam_modutil_search_key(pam_handle_t *pamh UNUSED, while (!feof(fp)) { char *tmp, *cp; -#if defined(HAVE_GETLINE) ssize_t n = getline(&buf, &buflen, fp); -#elif defined (HAVE_GETDELIM) - ssize_t n = getdelim(&buf, &buflen, '\n', fp); -#else - ssize_t n; - - if (buf == NULL) { - buflen = BUF_SIZE; - buf = malloc(buflen); - if (buf == NULL) { - fclose(fp); - return NULL; - } - } - buf[0] = '\0'; - if (fgets(buf, buflen - 1, fp) == NULL) - break; - else if (buf != NULL) - n = strlen(buf); - else - n = 0; -#endif /* HAVE_GETLINE / HAVE_GETDELIM */ + cp = buf; if (n < 1) |