tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) [auth-pam.c] Don't use crappy APIs like sprintf. Thanks bal

This commit is contained in:
Damien Miller 2003-07-30 14:53:11 +10:00
parent fbba5a0501
commit 7f2d795e3f
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,6 @@
20030730
- (djm) [auth-pam.c] Don't use crappy APIs like sprintf. Thanks bal
20030726 20030726
- (dtucker) [openbsd-compat/xcrypt.c] Fix typo: DISABLED_SHADOW -> - (dtucker) [openbsd-compat/xcrypt.c] Fix typo: DISABLED_SHADOW ->
DISABLE_SHADOW. Fixes HP-UX compile error. DISABLE_SHADOW. Fixes HP-UX compile error.
@ -732,4 +735,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2866 2003/07/26 09:38:30 dtucker Exp $ $Id: ChangeLog,v 1.2867 2003/07/30 04:53:11 djm Exp $

13
auth-pam.c
View File

@ -31,7 +31,7 @@
/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
#include "includes.h" #include "includes.h"
RCSID("$Id: auth-pam.c,v 1.64 2003/06/03 00:25:48 djm Exp $"); RCSID("$Id: auth-pam.c,v 1.65 2003/07/30 04:53:11 djm Exp $");
#ifdef USE_PAM #ifdef USE_PAM
#include <security/pam_appl.h> #include <security/pam_appl.h>
@ -373,6 +373,7 @@ sshpam_query(void *ctx, char **name, char **info,
size_t plen; size_t plen;
u_char type; u_char type;
char *msg; char *msg;
size_t len;
buffer_init(&buffer); buffer_init(&buffer);
*name = xstrdup(""); *name = xstrdup("");
@ -388,16 +389,18 @@ sshpam_query(void *ctx, char **name, char **info,
case PAM_PROMPT_ECHO_ON: case PAM_PROMPT_ECHO_ON:
case PAM_PROMPT_ECHO_OFF: case PAM_PROMPT_ECHO_OFF:
*num = 1; *num = 1;
**prompts = xrealloc(**prompts, plen + strlen(msg) + 1); len = plen + strlen(msg) + 1;
plen += sprintf(**prompts + plen, "%s", msg); **prompts = xrealloc(**prompts, len);
plen += snprintf(**prompts + plen, len, "%s", msg);
**echo_on = (type == PAM_PROMPT_ECHO_ON); **echo_on = (type == PAM_PROMPT_ECHO_ON);
xfree(msg); xfree(msg);
return (0); return (0);
case PAM_ERROR_MSG: case PAM_ERROR_MSG:
case PAM_TEXT_INFO: case PAM_TEXT_INFO:
/* accumulate messages */ /* accumulate messages */
**prompts = xrealloc(**prompts, plen + strlen(msg) + 1); len = plen + strlen(msg) + 1;
plen += sprintf(**prompts + plen, "%s", msg); **prompts = xrealloc(**prompts, len);
plen += snprintf(**prompts + plen, len, "%s", msg);
xfree(msg); xfree(msg);
break; break;
case PAM_NEW_AUTHTOK_REQD: case PAM_NEW_AUTHTOK_REQD: