diff options
| author | ikerexxe <ipedrosa@redhat.com> | 2020-07-15 09:45:12 +0200 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2020-07-15 08:05:07 +0000 |
| commit | 48f44125fac8873237ade9e94942f82a8e6d6e1d (patch) | |
| tree | b86be48f82e4a9d973f7b745f139c6cc5408be07 /modules/pam_unix/unix_update.c | |
| parent | b36351dd0137034e79194023c8d687b495e785c4 (diff) | |
| download | pam-48f44125fac8873237ade9e94942f82a8e6d6e1d.tar.gz pam-48f44125fac8873237ade9e94942f82a8e6d6e1d.tar.bz2 pam-48f44125fac8873237ade9e94942f82a8e6d6e1d.zip | |
Move read_passwords function from pam_unix to pam_inline.h
[ldv: rewrote commit message]
* modules/pam_unix/passverify.h (read_passwords): Remove prototype.
* modules/pam_unix/passverify.c (read_passwords): Move ...
* libpam/include/pam_inline.h: ... here, rename to pam_read_passwords,
add static inline qualifiers.
Include <unistd.h> and <errno.h>.
* modules/pam_unix/unix_chkpwd.c: Include "pam_inline.h".
(main): Replace read_passwords with pam_read_passwords.
* modules/pam_unix/unix_update.c: Include "pam_inline.h".
(set_password): Replace read_passwords with pam_read_passwords.
Diffstat (limited to 'modules/pam_unix/unix_update.c')
| -rw-r--r-- | modules/pam_unix/unix_update.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/pam_unix/unix_update.c b/modules/pam_unix/unix_update.c index ae77fe2e..3559972b 100644 --- a/modules/pam_unix/unix_update.c +++ b/modules/pam_unix/unix_update.c @@ -32,6 +32,7 @@ #include <security/_pam_macros.h> #include "passverify.h" +#include "pam_inline.h" static int set_password(const char *forwho, const char *shadow, const char *remember) @@ -49,7 +50,7 @@ set_password(const char *forwho, const char *shadow, const char *remember) /* read the password from stdin (a pipe from the pam_unix module) */ - npass = read_passwords(STDIN_FILENO, 2, passwords); + npass = pam_read_passwords(STDIN_FILENO, 2, passwords); if (npass != 2) { /* is it a valid password? */ if (npass == 1) { |