build fixes

.gear/nxssh.spec

@@ -43,6 +43,7 @@ confdir=""
 [ -r "/etc/ssh/ssh_config" ] && confdir="/ssh"
 [ -r "/etc/ssh_config" ] && confdir="/"
 %__subst "s|-DSSHDIR=\\\\\"\$(sysconfdir)\\\\\"|-DSSHDIR=\\\\\"\$(sysconfdir)${confdir}\\\\\"|g" Makefile.in
+%__subst "s|\[ #include <stdio.h> \]|\[ #include <stdlib.h> \]|g" configure.ac
 
 %autoreconf
 %configure --without-zlib-version-check %{subst_with kerberos5}

sshconnect.c

@@ -81,6 +81,7 @@
 #include "authfile.h"
 #include "ssherr.h"
 #include "authfd.h"
+#include "uuencode.h"
 
 #define PANIC
 #define WARNING
@@ -562,7 +563,7 @@ ssh_webproxy_connect(const char *proxy_host, u_short proxy_port, const char *pro
                         }
 
                         if (timeout_connect(sock, ai->ai_addr, ai->ai_addrlen,
-                                options.connection_timeout) >= 0)
+                                &options.connection_timeout) >= 0)
                         {
                                 /* Successful connection. */
                                 memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen);

sshconnect2.c

@@ -393,7 +393,7 @@ Authmethod nxauthmethods_pubkey[] = {
 #endif
 	{"publickey",
 		userauth_pubkey,
-		&options.pubkey_authentication,
+		(void (*)(struct cauthctxt *))&options.pubkey_authentication,
 		NULL},
 	{"none",
 		userauth_none,
@@ -405,11 +405,11 @@ Authmethod nxauthmethods_pubkey[] = {
 Authmethod nxauthmethods_passwords[] = {
 	{"keyboard-interactive",
 		userauth_kbdint,
-		&options.kbd_interactive_authentication,
+		(void (*)(struct cauthctxt *))&options.kbd_interactive_authentication,
 		&options.batch_mode},
         {"password",
                 userauth_passwd,
-                &options.password_authentication,
+                (void (*)(struct cauthctxt *))&options.password_authentication,
                 &options.batch_mode},
         {"none",
                 userauth_none,