diff options
| author | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 12:48:14 -0800 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 12:48:14 -0800 |
| commit | d5b06b67bbeeed7c05c0eb2e05d6a972ad050d1c (patch) | |
| tree | ba5654cffacfd2002eefc5bc3764a7971afff1dc /Linux-PAM/libpamc/pamc_converse.c | |
| parent | 4c51da22e068907adb7857d50f5109a467c94d7c (diff) | |
| parent | 7cbfa335c57d068d59508c844f3957165cccfb9b (diff) | |
| download | pam-d5b06b67bbeeed7c05c0eb2e05d6a972ad050d1c.tar.gz pam-d5b06b67bbeeed7c05c0eb2e05d6a972ad050d1c.tar.bz2 pam-d5b06b67bbeeed7c05c0eb2e05d6a972ad050d1c.zip | |
New upstream version 0.99.7.1
Diffstat (limited to 'Linux-PAM/libpamc/pamc_converse.c')
| -rw-r--r-- | Linux-PAM/libpamc/pamc_converse.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Linux-PAM/libpamc/pamc_converse.c b/Linux-PAM/libpamc/pamc_converse.c index 131789fb..50f25200 100644 --- a/Linux-PAM/libpamc/pamc_converse.c +++ b/Linux-PAM/libpamc/pamc_converse.c @@ -1,5 +1,5 @@ /* - * $Id: pamc_converse.c,v 1.2 2001/01/20 22:29:47 agmorgan Exp $ + * $Id: pamc_converse.c,v 1.5 2005/11/24 17:15:31 ldv Exp $ * * Copyright (c) Andrew G. Morgan <morgan@ftp.kernel.org> * @@ -34,8 +34,8 @@ static int __pamc_select_agent(pamc_handle_t pch, char *agent_id) int pamc_converse(pamc_handle_t pch, pamc_bp_t *prompt_p) { - __u32 size, offset=0; - __u8 control, raw[PAM_BP_MIN_SIZE]; + u_int32_t size, offset=0; + u_int8_t control, raw[PAM_BP_MIN_SIZE]; D(("called")); @@ -66,11 +66,12 @@ int pamc_converse(pamc_handle_t pch, pamc_bp_t *prompt_p) D(("*prompt_p is not legal for the client to use")); goto pamc_unknown_prompt; } - + /* do we need to select the agent? */ if ((*prompt_p)->control == PAM_BPC_SELECT) { char *rawh; - int i, retval; + size_t i; + int retval; D(("selecting a specified agent")); @@ -109,14 +110,14 @@ int pamc_converse(pamc_handle_t pch, pamc_bp_t *prompt_p) /* pump all of the prompt into the agent */ do { int rval = write(pch->current->writer, - offset + (const __u8 *) (*prompt_p), + offset + (const u_int8_t *) (*prompt_p), size - offset); if (rval == -1) { switch (errno) { case EINTR: break; default: - D(("problem writing to agent: %s", strerror(errno))); + D(("problem writing to agent: %m")); goto pamc_unknown_prompt; } } else { @@ -141,7 +142,7 @@ int pamc_converse(pamc_handle_t pch, pamc_bp_t *prompt_p) case EINTR: break; default: - D(("problem reading from agent: %s", strerror(errno))); + D(("problem reading from agent: %m")); goto pamc_unknown_prompt; } } else if (rval) { @@ -171,7 +172,7 @@ int pamc_converse(pamc_handle_t pch, pamc_bp_t *prompt_p) value from the previous loop */ while (offset < size) { - int rval = read(pch->current->reader, offset + (__u8 *) *prompt_p, + int rval = read(pch->current->reader, offset + (u_int8_t *) *prompt_p, size-offset); if (rval == -1) { @@ -179,7 +180,7 @@ int pamc_converse(pamc_handle_t pch, pamc_bp_t *prompt_p) case EINTR: break; default: - D(("problem reading from agent: %s", strerror(errno))); + D(("problem reading from agent: %m")); goto pamc_unknown_prompt; } } else if (rval) { @@ -208,4 +209,3 @@ pamc_unknown_prompt: PAM_BP_RENEW(prompt_p, PAM_BPC_FAIL, 0); return PAM_BPC_TRUE; } - |