diff options
| author | Tobias Stoeckmann <tobias@stoeckmann.org> | 2024-01-11 23:21:54 +0100 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2024-01-12 17:01:04 +0000 |
| commit | d9494352c571d332cf92bdadcd898894f0af12df (patch) | |
| tree | ef1b99c51a3b7d3f8fdcb87803fe957f95a7dafc /modules/pam_pwhistory | |
| parent | cf80332ddb98c109c5abc35c74d6dd371ca7fa5b (diff) | |
| download | pam-d9494352c571d332cf92bdadcd898894f0af12df.tar.gz pam-d9494352c571d332cf92bdadcd898894f0af12df.tar.bz2 pam-d9494352c571d332cf92bdadcd898894f0af12df.zip | |
modules: simplify newline removal
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Diffstat (limited to 'modules/pam_pwhistory')
| -rw-r--r-- | modules/pam_pwhistory/opasswd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/pam_pwhistory/opasswd.c b/modules/pam_pwhistory/opasswd.c index f1f62aaf..58b386bd 100644 --- a/modules/pam_pwhistory/opasswd.c +++ b/modules/pam_pwhistory/opasswd.c @@ -188,8 +188,7 @@ check_old_pass, const char *user, const char *newpass, const char *filename, int if (*cp == '\0') /* ignore empty lines */ continue; - if (cp[strlen (cp) - 1] == '\n') - cp[strlen (cp) - 1] = '\0'; + cp[strcspn(cp, "\n")] = '\0'; if (strncmp (cp, user, strlen (user)) == 0 && cp[strlen (user)] == ':') @@ -387,8 +386,7 @@ save_old_pass, const char *user, int howmany, const char *filename, int debug UN if (*cp == '\0') /* ignore empty lines */ goto write_old_data; - if (cp[strlen (cp) - 1] == '\n') - cp[strlen (cp) - 1] = '\0'; + cp[strcspn(cp, "\n")] = '\0'; if (strncmp (cp, user, strlen (user)) == 0 && cp[strlen (user)] == ':') |