diff options
| author | Sam Hartman <hartmans@debian.org> | 2023-09-11 14:10:02 -0600 |
|---|---|---|
| committer | Sam Hartman <hartmans@debian.org> | 2023-09-11 14:10:02 -0600 |
| commit | 42408448b00a7a2150b5853dc4f63296b6827e0e (patch) | |
| tree | f2d801e728b41563b77ebe89a3d560319ff37d31 /libpam_misc/misc_conv.c | |
| parent | b99a4f53dcf4725e4b3b861fd8a28c0156a8a147 (diff) | |
| parent | e9aa2ef52a423a3a33299bf7e8715eb5bd76ea67 (diff) | |
| download | pam-42408448b00a7a2150b5853dc4f63296b6827e0e.tar.gz pam-42408448b00a7a2150b5853dc4f63296b6827e0e.tar.bz2 pam-42408448b00a7a2150b5853dc4f63296b6827e0e.zip | |
Update upstream source from tag 'upstream/1.5.3'
Update to upstream version '1.5.3'
with Debian dir 6b9d9dfb8a4ca02d4557097ee59960e72a6a4a29
Diffstat (limited to 'libpam_misc/misc_conv.c')
| -rw-r--r-- | libpam_misc/misc_conv.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libpam_misc/misc_conv.c b/libpam_misc/misc_conv.c index 908ee890..dbcd6aec 100644 --- a/libpam_misc/misc_conv.c +++ b/libpam_misc/misc_conv.c @@ -17,6 +17,7 @@ #include <security/pam_appl.h> #include <security/pam_misc.h> +#include "pam_inline.h" #define INPUTSIZE PAM_MISC_CONV_BUFSIZE /* maximum length of input+1 */ #define CONV_ECHO_ON 1 /* types of echo state */ @@ -185,7 +186,7 @@ static int read_string(int echo, const char *prompt, char **retstr) int rv; if ((rv=read(STDIN_FILENO, line+nc, 1)) != 1) { if (rv < 0) { - _pam_overwrite_n(line, (unsigned int) nc); + pam_overwrite_n(line, (unsigned int) nc); nc = rv; } break; @@ -213,7 +214,7 @@ static int read_string(int echo, const char *prompt, char **retstr) line[nc] = '\0'; } *retstr = strdup(line); - _pam_overwrite(line); + pam_overwrite_array(line); if (!*retstr) { D(("no memory for response string")); nc = -1; @@ -246,7 +247,7 @@ static int read_string(int echo, const char *prompt, char **retstr) D(("the timer appears to have expired")); *retstr = NULL; - _pam_overwrite_n(line, sizeof(line)); + pam_overwrite_array(line); cleanexit: @@ -376,7 +377,7 @@ failed_conversation: switch (msgm[count]->msg_style) { case PAM_PROMPT_ECHO_ON: case PAM_PROMPT_ECHO_OFF: - _pam_overwrite(reply[count].resp); + pam_overwrite_string(reply[count].resp); free(reply[count].resp); break; case PAM_BINARY_PROMPT: |