From 4b6d3e99e6bc7ecf0d8cb2dbdc3d231eb740b47c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Groenvall?= Date: Tue, 20 May 1997 18:40:42 +0000 Subject: [PATCH] Made things compile with socks5-v1.0r1. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1748 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/ftp/ftp/ftp_locl.h | 9 +++++---- appl/ftp/ftpd/ftpd.c | 9 +++++---- appl/kx/kx.h | 8 ++++---- appl/popper/popper.h | 8 ++++---- appl/telnet/libtelnet/auth.c | 7 ++++--- appl/telnet/libtelnet/enc_des.c | 6 +++--- appl/telnet/libtelnet/encrypt.c | 7 ++++--- appl/telnet/libtelnet/kerberos.c | 8 ++++---- appl/telnet/libtelnet/kerberos5.c | 6 +++--- appl/telnet/libtelnet/krb4encpwd.c | 6 +++--- appl/telnet/libtelnet/misc.c | 7 ++++--- appl/telnet/libtelnet/read_password.c | 6 +++--- appl/telnet/libtelnet/rsaencpwd.c | 6 +++--- appl/telnet/libtelnet/spx.c | 7 ++++--- appl/telnet/telnet/telnet_locl.h | 11 ++++++++--- 15 files changed, 61 insertions(+), 50 deletions(-) diff --git a/appl/ftp/ftp/ftp_locl.h b/appl/ftp/ftp/ftp_locl.h index f5d069c21..5d91252b4 100644 --- a/appl/ftp/ftp/ftp_locl.h +++ b/appl/ftp/ftp/ftp_locl.h @@ -45,10 +45,6 @@ #include #endif -#ifdef SOCKS -#include -#endif - #include #ifdef HAVE_PWD_H @@ -123,6 +119,11 @@ #include +#ifdef SOCKS +#include +extern int LIBPREFIX(fclose) __P((FILE *)); +#endif + #include "ftp_var.h" #include "extern.h" #include "common.h" diff --git a/appl/ftp/ftpd/ftpd.c b/appl/ftp/ftpd/ftpd.c index d680a4329..78a7f4ee8 100644 --- a/appl/ftp/ftpd/ftpd.c +++ b/appl/ftp/ftpd/ftpd.c @@ -36,10 +36,6 @@ RCSID("$Id$"); #endif -#ifdef SOCKS -#include -#endif - /* * FTP server. */ @@ -141,6 +137,11 @@ RCSID("$Id$"); #include +#ifdef SOCKS +#include +extern int LIBPREFIX(fclose) __P((FILE *)); +#endif + void yyparse(); #ifndef LOG_FTP diff --git a/appl/kx/kx.h b/appl/kx/kx.h index 73ae47ab8..094f9ddda 100644 --- a/appl/kx/kx.h +++ b/appl/kx/kx.h @@ -42,10 +42,6 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#ifdef SOCKS -#include -#endif - #include #include #include @@ -109,6 +105,10 @@ #include #include +#ifdef SOCKS +#include +#endif + #include #include diff --git a/appl/popper/popper.h b/appl/popper/popper.h index acc78ca2e..30786f7e9 100644 --- a/appl/popper/popper.h +++ b/appl/popper/popper.h @@ -23,10 +23,6 @@ #define RETURN_PATH_HANDLING #endif -#ifdef SOCKS -#include -#endif - /* Common include files */ #include @@ -89,6 +85,10 @@ #endif #include "version.h" +#ifdef SOCKS +#include +#endif + #include #include diff --git a/appl/telnet/libtelnet/auth.c b/appl/telnet/libtelnet/auth.c index 620e2b64a..ddd8aa59e 100644 --- a/appl/telnet/libtelnet/auth.c +++ b/appl/telnet/libtelnet/auth.c @@ -52,9 +52,6 @@ */ #include -#ifdef SOCKS -#include -#endif RCSID("$Id$"); @@ -70,6 +67,10 @@ RCSID("$Id$"); #endif #include #include +#ifdef SOCKS +#include +#endif + #include #include "encrypt.h" diff --git a/appl/telnet/libtelnet/enc_des.c b/appl/telnet/libtelnet/enc_des.c index 3eeb45a5b..7c15a0c45 100644 --- a/appl/telnet/libtelnet/enc_des.c +++ b/appl/telnet/libtelnet/enc_des.c @@ -32,9 +32,6 @@ */ #include -#ifdef SOCKS -#include -#endif RCSID("$Id$"); @@ -45,6 +42,9 @@ RCSID("$Id$"); #include #include #endif +#ifdef SOCKS +#include +#endif #include "encrypt.h" #include "misc-proto.h" diff --git a/appl/telnet/libtelnet/encrypt.c b/appl/telnet/libtelnet/encrypt.c index c15ab5b9a..12c6ca5f7 100644 --- a/appl/telnet/libtelnet/encrypt.c +++ b/appl/telnet/libtelnet/encrypt.c @@ -53,9 +53,6 @@ #include -#ifdef SOCKS -#include -#endif RCSID("$Id$"); @@ -69,6 +66,10 @@ RCSID("$Id$"); #include #include +#ifdef SOCKS +#include +#endif + #include /* diff --git a/appl/telnet/libtelnet/kerberos.c b/appl/telnet/libtelnet/kerberos.c index 4dfcc1033..65839d664 100644 --- a/appl/telnet/libtelnet/kerberos.c +++ b/appl/telnet/libtelnet/kerberos.c @@ -55,10 +55,6 @@ #include #endif -#ifdef SOCKS -#include -#endif - RCSID("$Id$"); #ifdef KRB4 @@ -74,6 +70,10 @@ RCSID("$Id$"); #include #include #include +#ifdef SOCKS +#include +#endif + #include #include "encrypt.h" diff --git a/appl/telnet/libtelnet/kerberos5.c b/appl/telnet/libtelnet/kerberos5.c index 91b0001b1..bbdd31245 100644 --- a/appl/telnet/libtelnet/kerberos5.c +++ b/appl/telnet/libtelnet/kerberos5.c @@ -52,9 +52,6 @@ */ #include -#ifdef SOCKS -#include -#endif static const char *error_message(long foo) { @@ -81,6 +78,9 @@ RCSID("$Id$"); #endif #include #include +#ifdef SOCKS +#include +#endif /* kerberos 5 include files (ext-proto.h) will get an appropriate stdlib.h and string.h/strings.h */ diff --git a/appl/telnet/libtelnet/krb4encpwd.c b/appl/telnet/libtelnet/krb4encpwd.c index 4eb41ca81..f781aec78 100644 --- a/appl/telnet/libtelnet/krb4encpwd.c +++ b/appl/telnet/libtelnet/krb4encpwd.c @@ -32,9 +32,6 @@ */ #include -#ifdef SOCKS -#include -#endif RCSID("$Id$"); @@ -81,6 +78,9 @@ RCSID("$Id$"); #include #include #include +#ifdef SOCKS +#include +#endif #include "encrypt.h" #include "auth.h" diff --git a/appl/telnet/libtelnet/misc.c b/appl/telnet/libtelnet/misc.c index 1ffe4330c..9b1862943 100644 --- a/appl/telnet/libtelnet/misc.c +++ b/appl/telnet/libtelnet/misc.c @@ -32,9 +32,6 @@ */ #include -#ifdef SOCKS -#include -#endif RCSID("$Id$"); @@ -42,6 +39,10 @@ RCSID("$Id$"); #include "auth.h" #include "encrypt.h" #include +#ifdef SOCKS +#include +#endif + #include char *RemoteHostName; diff --git a/appl/telnet/libtelnet/read_password.c b/appl/telnet/libtelnet/read_password.c index ce96d2a2f..7f41da08e 100644 --- a/appl/telnet/libtelnet/read_password.c +++ b/appl/telnet/libtelnet/read_password.c @@ -45,9 +45,6 @@ */ #include -#ifdef SOCKS -#include -#endif RCSID("$Id$"); @@ -58,6 +55,9 @@ RCSID("$Id$"); #include #include #include +#ifdef SOCKS +#include +#endif static jmp_buf env; diff --git a/appl/telnet/libtelnet/rsaencpwd.c b/appl/telnet/libtelnet/rsaencpwd.c index 5b4cfdb45..7e075b22f 100644 --- a/appl/telnet/libtelnet/rsaencpwd.c +++ b/appl/telnet/libtelnet/rsaencpwd.c @@ -32,9 +32,6 @@ */ #include -#ifdef SOCKS -#include -#endif RCSID("$Id$"); @@ -81,6 +78,9 @@ RCSID("$Id$"); #include #include +#ifdef SOCKS +#include +#endif #include "encrypt.h" #include "auth.h" diff --git a/appl/telnet/libtelnet/spx.c b/appl/telnet/libtelnet/spx.c index c1ac7440e..22d3cca33 100644 --- a/appl/telnet/libtelnet/spx.c +++ b/appl/telnet/libtelnet/spx.c @@ -32,9 +32,6 @@ */ #include -#ifdef SOCKS -#include -#endif RCSID("$Id$"); @@ -84,6 +81,10 @@ RCSID("$Id$"); #include #include +#ifdef SOCKS +#include +#endif + #include "encrypt.h" #include "auth.h" #include "misc.h" diff --git a/appl/telnet/telnet/telnet_locl.h b/appl/telnet/telnet/telnet_locl.h index d489c9a29..a3d4225c6 100644 --- a/appl/telnet/telnet/telnet_locl.h +++ b/appl/telnet/telnet/telnet_locl.h @@ -41,9 +41,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef SOCKS -#include -#endif #include #include @@ -63,6 +60,10 @@ #include #endif +#ifdef HAVE_CURSES_H +#include +#endif + #include #ifdef HAVE_FCNTL_H @@ -130,6 +131,10 @@ #include #endif +#ifdef SOCKS +#include +#endif + #include #include