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

   error. Part of Bug #423, patch from  michael_steffens AT hp.com

2 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 4e2bdda64..c80b816f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 $
diff --git a/auth-pam.c b/auth-pam.c
index 08b88f0dd..3f3fbf28c 100644
--- a/auth-pam.c
+++ b/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 $ */
 #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)");