diff options
| author | Dmitry V. Levin <ldv@strace.io> | 2024-01-16 08:00:00 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2024-01-16 08:00:00 +0000 |
| commit | 7055a56794dd18f7a29e4064d7f227ac3e04709c (patch) | |
| tree | 4932e22c3ee734462cf497e2d1a1a2c6ddb157ac | |
| parent | bb9edf1bdd543bddc9cb44df88d70e6b8d8d826b (diff) | |
| download | pam-7055a56794dd18f7a29e4064d7f227ac3e04709c.tar.gz pam-7055a56794dd18f7a29e4064d7f227ac3e04709c.tar.bz2 pam-7055a56794dd18f7a29e4064d7f227ac3e04709c.zip | |
modules: do not invoke getline(3) unnecessarily
Replace
while (getline(...) != -1 && retval)
with
while (retval && getline(...) != -1)
* modules/pam_listfile/pam_listfile.c (pam_listfile): Do not invoke
getline(3) when its result is going to be ignored.
* modules/pam_securetty/pam_securetty.c (securetty_perform_check):
Likewise.
| -rw-r--r-- | modules/pam_listfile/pam_listfile.c | 2 | ||||
| -rw-r--r-- | modules/pam_securetty/pam_securetty.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/modules/pam_listfile/pam_listfile.c b/modules/pam_listfile/pam_listfile.c index 6ac34744..b0bd2214 100644 --- a/modules/pam_listfile/pam_listfile.c +++ b/modules/pam_listfile/pam_listfile.c @@ -307,7 +307,7 @@ pam_listfile(pam_handle_t *pamh, int argc, const char **argv) assert(PAM_SUCCESS == 0); assert(PAM_AUTH_ERR != 0); #endif - while(getline(&aline,&n,inf) != -1 && retval) { + while(retval && getline(&aline,&n,inf) != -1) { const char *a = aline; aline[strcspn(aline, "\r\n")] = '\0'; diff --git a/modules/pam_securetty/pam_securetty.c b/modules/pam_securetty/pam_securetty.c index 617af679..9264a309 100644 --- a/modules/pam_securetty/pam_securetty.c +++ b/modules/pam_securetty/pam_securetty.c @@ -157,8 +157,7 @@ securetty_perform_check (pam_handle_t *pamh, int ctrl, retval = 1; - while ((getline(&ttyfileline, &ttyfilelinelen, ttyfile) != -1) - && retval) { + while (retval && getline(&ttyfileline, &ttyfilelinelen, ttyfile) != -1) { ttyfileline[strcspn(ttyfileline, "\n")] = '\0'; retval = ( strcmp(ttyfileline, uttyname) |