Commit c6364eb1 authored by Pavel Vainerman's avatar Pavel Vainerman

fix: build for gcc 14

parent 271921d3
...@@ -490,6 +490,7 @@ case "$host" in ...@@ -490,6 +490,7 @@ case "$host" in
AC_MSG_CHECKING([if compiler allows macro redefinitions]) AC_MSG_CHECKING([if compiler allows macro redefinitions])
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[ [AC_LANG_PROGRAM([[
#include <stdlib.h>
#define testmacro foo #define testmacro foo
#define testmacro bar]], #define testmacro bar]],
[[ exit(0); ]])], [[ exit(0); ]])],
...@@ -1164,7 +1165,8 @@ mips-sony-bsd|mips-sony-newsos4) ...@@ -1164,7 +1165,8 @@ mips-sony-bsd|mips-sony-newsos4)
esac esac
AC_MSG_CHECKING([compiler and flags for sanity]) AC_MSG_CHECKING([compiler and flags for sanity])
AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> ]], [[ exit(0); ]])], AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h>
#include <stdlib.h> ]], [[ exit(0); ]])],
[ AC_MSG_RESULT([yes]) ], [ AC_MSG_RESULT([yes]) ],
[ [
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
...@@ -1187,6 +1189,7 @@ AC_CHECK_FUNCS([dirname], [AC_CHECK_HEADERS([libgen.h])] , [ ...@@ -1187,6 +1189,7 @@ AC_CHECK_FUNCS([dirname], [AC_CHECK_HEADERS([libgen.h])] , [
AC_RUN_IFELSE( AC_RUN_IFELSE(
[AC_LANG_SOURCE([[ [AC_LANG_SOURCE([[
#include <libgen.h> #include <libgen.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
int main(int argc, char **argv) { int main(int argc, char **argv) {
......
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
#include "buffer.h" #include "buffer.h"
#include "packet.h" #include "packet.h"
#include "uidswap.h" #include "uidswap.h"
#include "uuencode.h"
#include "compat.h" #include "compat.h"
#include "key.h" #include "key.h"
#include "sshconnect.h" #include "sshconnect.h"
...@@ -562,7 +563,7 @@ ssh_webproxy_connect(const char *proxy_host, u_short proxy_port, const char *pro ...@@ -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, if (timeout_connect(sock, ai->ai_addr, ai->ai_addrlen,
options.connection_timeout) >= 0) &options.connection_timeout) >= 0)
{ {
/* Successful connection. */ /* Successful connection. */
memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen); memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen);
......
...@@ -393,29 +393,34 @@ Authmethod nxauthmethods_pubkey[] = { ...@@ -393,29 +393,34 @@ Authmethod nxauthmethods_pubkey[] = {
#endif #endif
{"publickey", {"publickey",
userauth_pubkey, userauth_pubkey,
NULL,
&options.pubkey_authentication, &options.pubkey_authentication,
NULL}, NULL},
{"none", {"none",
userauth_none, userauth_none,
NULL, NULL,
NULL,
NULL}, NULL},
{NULL, NULL, NULL, NULL} {NULL, NULL, NULL, NULL, NULL}
}; };
Authmethod nxauthmethods_passwords[] = { Authmethod nxauthmethods_passwords[] = {
{"keyboard-interactive", {"keyboard-interactive",
userauth_kbdint, userauth_kbdint,
NULL,
&options.kbd_interactive_authentication, &options.kbd_interactive_authentication,
&options.batch_mode}, &options.batch_mode},
{"password", {"password",
userauth_passwd, userauth_passwd,
NULL,
&options.password_authentication, &options.password_authentication,
&options.batch_mode}, &options.batch_mode},
{"none", {"none",
userauth_none, userauth_none,
NULL, NULL,
NULL,
NULL}, NULL},
{NULL, NULL, NULL, NULL} {NULL, NULL, NULL, NULL, NULL}
}; };
void void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment