From edb66c93548689772444018684a3e3d553124a28 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Fri, 18 Oct 1996 05:35:32 +0000 Subject: [PATCH] SOCKS-support git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@860 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/ftp/ftp/ftp_locl.h | 4 ++++ appl/ftp/ftp/kauth.c | 6 +----- appl/ftp/ftpd/ftpcmd.y | 4 ++++ appl/ftp/ftpd/ftpd.c | 4 ++++ appl/kx/kx.h | 4 ++++ appl/popper/popper.h | 4 ++++ appl/telnet/libtelnet/auth.c | 3 +++ appl/telnet/libtelnet/enc_des.c | 3 +++ appl/telnet/libtelnet/encrypt.c | 3 +++ appl/telnet/libtelnet/kerberos.c | 4 ++++ appl/telnet/libtelnet/kerberos5.c | 3 +++ appl/telnet/libtelnet/krb4encpwd.c | 3 +++ appl/telnet/libtelnet/misc.c | 3 +++ appl/telnet/libtelnet/read_password.c | 3 +++ appl/telnet/libtelnet/rsaencpwd.c | 3 +++ appl/telnet/libtelnet/spx.c | 3 +++ appl/telnet/telnet/authenc.c | 3 +++ appl/telnet/telnet/commands.c | 3 +++ appl/telnet/telnet/main.c | 3 +++ appl/telnet/telnet/network.c | 3 +++ appl/telnet/telnet/ring.c | 3 +++ appl/telnet/telnet/sys_bsd.c | 3 +++ appl/telnet/telnet/telnet.c | 3 +++ appl/telnet/telnet/terminal.c | 3 +++ appl/telnet/telnet/utilities.c | 3 +++ appl/telnet/telnetd/authenc.c | 3 +++ appl/telnet/telnetd/global.c | 3 +++ appl/telnet/telnetd/slc.c | 3 +++ appl/telnet/telnetd/state.c | 3 +++ appl/telnet/telnetd/sys_term.c | 3 +++ appl/telnet/telnetd/telnetd.c | 3 +++ appl/telnet/telnetd/termstat.c | 3 +++ appl/telnet/telnetd/utility.c | 3 +++ 33 files changed, 103 insertions(+), 5 deletions(-) diff --git a/appl/ftp/ftp/ftp_locl.h b/appl/ftp/ftp/ftp_locl.h index da0082bd8..a8588a637 100644 --- a/appl/ftp/ftp/ftp_locl.h +++ b/appl/ftp/ftp/ftp_locl.h @@ -7,6 +7,10 @@ #include #endif +#ifdef SOCKS +#include +#endif + #include #include diff --git a/appl/ftp/ftp/kauth.c b/appl/ftp/ftp/kauth.c index f6086e8f9..d400054a9 100644 --- a/appl/ftp/ftp/kauth.c +++ b/appl/ftp/ftp/kauth.c @@ -1,10 +1,6 @@ -#ifdef HAVE_CONFIG_H -#include -#endif - +#include "ftp_locl.h" RCSID("$Id$"); -#include "ftp_locl.h" #include void kauth(int argc, char **argv) diff --git a/appl/ftp/ftpd/ftpcmd.y b/appl/ftp/ftpd/ftpcmd.y index 91cddd397..8df679467 100644 --- a/appl/ftp/ftpd/ftpcmd.y +++ b/appl/ftp/ftpd/ftpcmd.y @@ -54,6 +54,10 @@ static char rcsid[] = "$NetBSD: ftpcmd.y,v 1.6 1995/06/03 22:46:45 mycroft Exp $ #include #endif +#ifdef SOCKS +#include +#endif + #include #include diff --git a/appl/ftp/ftpd/ftpd.c b/appl/ftp/ftpd/ftpd.c index ad6bcfa56..45a90a8ce 100644 --- a/appl/ftp/ftpd/ftpd.c +++ b/appl/ftp/ftpd/ftpd.c @@ -38,6 +38,10 @@ RCSID("$Id$"); #endif +#ifdef SOCKS +#include +#endif + /* * FTP server. */ diff --git a/appl/kx/kx.h b/appl/kx/kx.h index 14ef9d3ad..251778f25 100644 --- a/appl/kx/kx.h +++ b/appl/kx/kx.h @@ -4,6 +4,10 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ +#ifdef SOCKS +#include +#endif + #include #include #include diff --git a/appl/popper/popper.h b/appl/popper/popper.h index 3244ef75e..4d6b85659 100644 --- a/appl/popper/popper.h +++ b/appl/popper/popper.h @@ -21,6 +21,10 @@ #define RETURN_PATH_HANDLING #endif +#ifdef SOCKS +#include +#endif + /* Common include files */ #include diff --git a/appl/telnet/libtelnet/auth.c b/appl/telnet/libtelnet/auth.c index f25ba0c94..74316bbee 100644 --- a/appl/telnet/libtelnet/auth.c +++ b/appl/telnet/libtelnet/auth.c @@ -52,6 +52,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/libtelnet/enc_des.c b/appl/telnet/libtelnet/enc_des.c index 52a9181df..74b60c397 100644 --- a/appl/telnet/libtelnet/enc_des.c +++ b/appl/telnet/libtelnet/enc_des.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/libtelnet/encrypt.c b/appl/telnet/libtelnet/encrypt.c index 98dc83399..e73c5470e 100644 --- a/appl/telnet/libtelnet/encrypt.c +++ b/appl/telnet/libtelnet/encrypt.c @@ -53,6 +53,9 @@ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/libtelnet/kerberos.c b/appl/telnet/libtelnet/kerberos.c index b39eb471c..cd4c722ef 100644 --- a/appl/telnet/libtelnet/kerberos.c +++ b/appl/telnet/libtelnet/kerberos.c @@ -55,6 +55,10 @@ #include #endif +#ifdef SOCKS +#include +#endif + RCSID("$Id$"); #ifdef KRB4 diff --git a/appl/telnet/libtelnet/kerberos5.c b/appl/telnet/libtelnet/kerberos5.c index e9e84f4cf..78577924c 100644 --- a/appl/telnet/libtelnet/kerberos5.c +++ b/appl/telnet/libtelnet/kerberos5.c @@ -60,6 +60,9 @@ char rcsid_kerberos5_c[] = "$Id$"; */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/libtelnet/krb4encpwd.c b/appl/telnet/libtelnet/krb4encpwd.c index 0de354d07..e38891f90 100644 --- a/appl/telnet/libtelnet/krb4encpwd.c +++ b/appl/telnet/libtelnet/krb4encpwd.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/libtelnet/misc.c b/appl/telnet/libtelnet/misc.c index ac3d64c62..b740414f7 100644 --- a/appl/telnet/libtelnet/misc.c +++ b/appl/telnet/libtelnet/misc.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/libtelnet/read_password.c b/appl/telnet/libtelnet/read_password.c index 2330b862d..e2aa00f56 100644 --- a/appl/telnet/libtelnet/read_password.c +++ b/appl/telnet/libtelnet/read_password.c @@ -45,6 +45,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/libtelnet/rsaencpwd.c b/appl/telnet/libtelnet/rsaencpwd.c index 74b57ffc5..638df6162 100644 --- a/appl/telnet/libtelnet/rsaencpwd.c +++ b/appl/telnet/libtelnet/rsaencpwd.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/libtelnet/spx.c b/appl/telnet/libtelnet/spx.c index b5b9c32f0..eb021b79c 100644 --- a/appl/telnet/libtelnet/spx.c +++ b/appl/telnet/libtelnet/spx.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnet/authenc.c b/appl/telnet/telnet/authenc.c index 98133bfb4..001a3497a 100644 --- a/appl/telnet/telnet/authenc.c +++ b/appl/telnet/telnet/authenc.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnet/commands.c b/appl/telnet/telnet/commands.c index eabbc934d..b47fb602b 100644 --- a/appl/telnet/telnet/commands.c +++ b/appl/telnet/telnet/commands.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnet/main.c b/appl/telnet/telnet/main.c index 78593fbfe..79c298aeb 100644 --- a/appl/telnet/telnet/main.c +++ b/appl/telnet/telnet/main.c @@ -38,6 +38,9 @@ static char copyright[] = #endif /* not lint */ #include +#ifdef SOCKS +#include +#endif #include "roken.h" RCSID("$Id$"); diff --git a/appl/telnet/telnet/network.c b/appl/telnet/telnet/network.c index e36cfd41c..5598e6652 100644 --- a/appl/telnet/telnet/network.c +++ b/appl/telnet/telnet/network.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnet/ring.c b/appl/telnet/telnet/ring.c index c8417c0a0..ead32652b 100644 --- a/appl/telnet/telnet/ring.c +++ b/appl/telnet/telnet/ring.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnet/sys_bsd.c b/appl/telnet/telnet/sys_bsd.c index f310df46f..93b32914a 100644 --- a/appl/telnet/telnet/sys_bsd.c +++ b/appl/telnet/telnet/sys_bsd.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnet/telnet.c b/appl/telnet/telnet/telnet.c index 8cb93af4a..74bc9f085 100644 --- a/appl/telnet/telnet/telnet.c +++ b/appl/telnet/telnet/telnet.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnet/terminal.c b/appl/telnet/telnet/terminal.c index 857319859..2053be283 100644 --- a/appl/telnet/telnet/terminal.c +++ b/appl/telnet/telnet/terminal.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnet/utilities.c b/appl/telnet/telnet/utilities.c index bf195b6cf..92cb1f168 100644 --- a/appl/telnet/telnet/utilities.c +++ b/appl/telnet/telnet/utilities.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnetd/authenc.c b/appl/telnet/telnetd/authenc.c index bc2d05a66..9ff46169f 100644 --- a/appl/telnet/telnetd/authenc.c +++ b/appl/telnet/telnetd/authenc.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnetd/global.c b/appl/telnet/telnetd/global.c index 477721b16..2c27bebe0 100644 --- a/appl/telnet/telnetd/global.c +++ b/appl/telnet/telnetd/global.c @@ -35,6 +35,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnetd/slc.c b/appl/telnet/telnetd/slc.c index ffbdcb42b..cc3cba227 100644 --- a/appl/telnet/telnetd/slc.c +++ b/appl/telnet/telnetd/slc.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnetd/state.c b/appl/telnet/telnetd/state.c index 0b394a87c..65f46c865 100644 --- a/appl/telnet/telnetd/state.c +++ b/appl/telnet/telnetd/state.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnetd/sys_term.c b/appl/telnet/telnetd/sys_term.c index edf1dde16..c75d95e34 100644 --- a/appl/telnet/telnetd/sys_term.c +++ b/appl/telnet/telnetd/sys_term.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnetd/telnetd.c b/appl/telnet/telnetd/telnetd.c index 900d8b083..6a5d21f0b 100644 --- a/appl/telnet/telnetd/telnetd.c +++ b/appl/telnet/telnetd/telnetd.c @@ -34,6 +34,9 @@ #ifdef HAVE_CONFIG_H #include #endif +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnetd/termstat.c b/appl/telnet/telnetd/termstat.c index a08d7af84..abfc086ac 100644 --- a/appl/telnet/telnetd/termstat.c +++ b/appl/telnet/telnetd/termstat.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$"); diff --git a/appl/telnet/telnetd/utility.c b/appl/telnet/telnetd/utility.c index 5b36426ed..730745320 100644 --- a/appl/telnet/telnetd/utility.c +++ b/appl/telnet/telnetd/utility.c @@ -32,6 +32,9 @@ */ #include +#ifdef SOCKS +#include +#endif RCSID("$Id$");