- (djm) Don't initialise pam_conv structures inline. Avoids HP/UX compiler
error. Part of Bug #423, patch from michael_steffens AT hp.com
This commit is contained in:
parent
0b56b45d6f
commit
f4b6f10ded
|
@ -47,6 +47,8 @@
|
||||||
- markus@cvs.openbsd.org 2003/09/01 20:44:54
|
- markus@cvs.openbsd.org 2003/09/01 20:44:54
|
||||||
[auth2-gss.c]
|
[auth2-gss.c]
|
||||||
fix leak
|
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
|
20030829
|
||||||
- (bal) openbsd-compat/ clean up. Considate headers, add in Id on our
|
- (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.
|
- 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.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
12
auth-pam.c
|
@ -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.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
|
#ifdef USE_PAM
|
||||||
#include <security/pam_appl.h>
|
#include <security/pam_appl.h>
|
||||||
|
@ -199,7 +199,7 @@ sshpam_thread(void *ctxtp)
|
||||||
{
|
{
|
||||||
struct pam_ctxt *ctxt = ctxtp;
|
struct pam_ctxt *ctxt = ctxtp;
|
||||||
Buffer buffer;
|
Buffer buffer;
|
||||||
struct pam_conv sshpam_conv = { sshpam_thread_conv, ctxt };
|
struct pam_conv sshpam_conv;
|
||||||
#ifndef USE_POSIX_THREADS
|
#ifndef USE_POSIX_THREADS
|
||||||
const char *pam_user;
|
const char *pam_user;
|
||||||
|
|
||||||
|
@ -207,6 +207,9 @@ sshpam_thread(void *ctxtp)
|
||||||
setproctitle("%s [pam]", pam_user);
|
setproctitle("%s [pam]", pam_user);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
sshpam_conv.conv = sshpam_thread_conv;
|
||||||
|
sshpam_conv.appdata_ptr = ctxt;
|
||||||
|
|
||||||
buffer_init(&buffer);
|
buffer_init(&buffer);
|
||||||
sshpam_err = pam_set_item(sshpam_handle, PAM_CONV,
|
sshpam_err = pam_set_item(sshpam_handle, PAM_CONV,
|
||||||
(const void *)&sshpam_conv);
|
(const void *)&sshpam_conv);
|
||||||
|
@ -634,7 +637,10 @@ pam_chauthtok_conv(int n, const struct pam_message **msg,
|
||||||
void
|
void
|
||||||
do_pam_chauthtok(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)
|
if (use_privsep)
|
||||||
fatal("Password expired (unable to change with privsep)");
|
fatal("Password expired (unable to change with privsep)");
|
||||||
|
|
Loading…
Reference in New Issue