diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2022-08-16 22:06:15 -0700 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2022-08-16 22:11:24 -0700 |
| commit | 7561896529a7af05201dc31e959a05897ef99e19 (patch) | |
| tree | 14514b088f45d4fecd3b7a6ede5e0a99f6c10f6a /modules/pam_env/pam_env.c | |
| parent | d071f8c9829cbd60e2a98ab5e6b1ddfdffb9b549 (diff) | |
| parent | 99d0d1c5c4f07332daa86e73981267a761bc966e (diff) | |
| download | pam-7561896529a7af05201dc31e959a05897ef99e19.tar.gz pam-7561896529a7af05201dc31e959a05897ef99e19.tar.bz2 pam-7561896529a7af05201dc31e959a05897ef99e19.zip | |
Merge new upstream version 1.5.2.
Diffstat (limited to 'modules/pam_env/pam_env.c')
| -rw-r--r-- | modules/pam_env/pam_env.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/pam_env/pam_env.c b/modules/pam_env/pam_env.c index 79d43722..f5f8cead 100644 --- a/modules/pam_env/pam_env.c +++ b/modules/pam_env/pam_env.c @@ -120,6 +120,9 @@ _pam_parse (const pam_handle_t *pamh, int argc, const char **argv, pam_syslog(pamh, LOG_ERR, "unknown option: %s", *argv); } + if (*user_readenv) + pam_syslog(pamh, LOG_DEBUG, "deprecated reading of user environment enabled"); + return ctrl; } @@ -311,7 +314,7 @@ static int _assemble_line(FILE *f, char *buffer, int buf_len) D(("_assemble_line: corrupted or binary file")); return -1; } - if (p[strlen(p)-1] != '\n') { + if (p[strlen(p)-1] != '\n' && !feof(f)) { D(("_assemble_line: line too long")); return -1; } |