mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-27 14:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) Don't initialise pam_conv structures inline. Avoids HP/UX compiler

Browse Source 
error. Part of Bug #423, patch from  michael_steffens AT hp.com
This commit is contained in:
Damien Miller 2003-09-02 23:12:06 +10:00
parent 0b56b45d6f
commit f4b6f10ded
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -47,6 +47,8 @@
- markus@cvs.openbsd.org 2003/09/01 20:44:54
[auth2-gss.c]
fix leak
- (djm) Don't initialise pam_conv structures inline. Avoids HP/UX compiler
error. Part of Bug #423, patch from michael_steffens AT hp.com
20030829
- (bal) openbsd-compat/ clean up. Considate headers, add in Id on our
@ -962,4 +964,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2934 2003/09/02 13:09:41 djm Exp $
$Id: ChangeLog,v 1.2935 2003/09/02 13:12:06 djm Exp $

12
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 $ */
#include "includes.h"
RCSID("$Id: auth-pam.c,v 1.68 2003/08/26 01:58:16 dtucker Exp $");
RCSID("$Id: auth-pam.c,v 1.69 2003/09/02 13:12:06 djm Exp $");
#ifdef USE_PAM
#include <security/pam_appl.h>
@ -199,7 +199,7 @@ sshpam_thread(void *ctxtp)
{
struct pam_ctxt *ctxt = ctxtp;
Buffer buffer;
struct pam_conv sshpam_conv = { sshpam_thread_conv, ctxt };
struct pam_conv sshpam_conv;
#ifndef USE_POSIX_THREADS
const char *pam_user;
@ -207,6 +207,9 @@ sshpam_thread(void *ctxtp)
setproctitle("%s [pam]", pam_user);
#endif
sshpam_conv.conv = sshpam_thread_conv;
sshpam_conv.appdata_ptr = ctxt;
buffer_init(&buffer);
sshpam_err = pam_set_item(sshpam_handle, PAM_CONV,
(const void *)&sshpam_conv);
@ -634,7 +637,10 @@ pam_chauthtok_conv(int n, const struct pam_message **msg,
void
do_pam_chauthtok(void)
{
struct pam_conv pam_conv = { pam_chauthtok_conv, NULL };
struct pam_conv pam_conv;
pam_conv.conv = pam_chauthtok_conv;
pam_conv.appdata_ptr = NULL;
if (use_privsep)
fatal("Password expired (unable to change with privsep)");