summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.in55
-rw-r--r--ssh.c6
-rw-r--r--ssh.h95
4 files changed, 7 insertions, 152 deletions
diff --git a/ChangeLog b/ChangeLog
index 51034cf88..a53f4367f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120000207
2 - Removed SOCKS code. Will support through a ProxyCommand.
3
120000203 420000203
2 - Fixed SEGVs in authloop, fix from vbzoli@hbrt.hu 5 - Fixed SEGVs in authloop, fix from vbzoli@hbrt.hu
3 - Add --with-ssl-dir option 6 - Add --with-ssl-dir option
diff --git a/configure.in b/configure.in
index 1176bfc48..f2128d7f1 100644
--- a/configure.in
+++ b/configure.in
@@ -524,59 +524,6 @@ if test ! -z "$nolastlog" ; then
524 AC_DEFINE(DISABLE_LASTLOG) 524 AC_DEFINE(DISABLE_LASTLOG)
525fi 525fi
526 526
527dnl Compile with dante SOCKS library
528AC_ARG_WITH(dante,
529 [ --with-dante=DIR Use Dante SOCKS lib (default is system library path)],
530 [
531 SAVELIBS="$LIBS"
532 SOCKSLIBS=""
533 SOCKSLIBPATH=""
534 if test "x$withval" != "xno" ; then
535 if test -n $withval ; then
536 LIBS="$LIBS -L$withval"
537 SOCKSLIBPATH="-L$withval"
538 fi
539 AC_CHECK_LIB(socks, Rconnect, AC_DEFINE(HAVE_DANTE) SOCKSLIBS="$SOCKSLIBPATH -lsocks")
540 fi
541 LIBS="$SAVELIBS $SOCKSLIBS"
542 ]
543)
544
545dnl Compile with SOCKS4 SOCKS library
546AC_ARG_WITH(socks4,
547 [ --with-socks4=DIR Use Socks4 SOCKS lib (default is system library path)],
548 [
549 SAVELIBS="$LIBS"
550 SOCKSLIBS=""
551 SOCKSLIBPATH=""
552 if test "x$withval" != "xno" ; then
553 if test -n $withval ; then
554 LIBS="$LIBS -L$withval"
555 SOCKSLIBPATH="-L$withval"
556 fi
557 AC_CHECK_LIB(socks, Rconnect, AC_DEFINE(HAVE_SOCKS4) SOCKSLIBS="$SOCKSLIBPATH -lsocks")
558 fi
559 LIBS="$SAVELIBS $SOCKSLIBS"
560 ]
561)
562
563dnl Compile with SOCKS5 SOCKS library
564AC_ARG_WITH(socks5,
565 [ --with-socks5=DIR Use Socks5 SOCKS lib (default is system library path)],
566 [
567 SAVELIBS="$LIBS"
568 SOCKSLIBS=""
569 SOCKSLIBPATH=""
570 if test "x$withval" != "xno" ; then
571 if test -n $withval ; then
572 LIBS="$LIBS -L$withval"
573 SOCKSLIBPATH="-L$withval"
574 fi
575 AC_CHECK_LIB(socks5, SOCKSconnect, AC_DEFINE(HAVE_SOCKS5) SOCKSLIBS="$SOCKSLIBPATH -lsocks5")
576 fi
577 LIBS="$SAVELIBS $SOCKSLIBS"
578 ]
579)
580AC_ARG_WITH(catman, 527AC_ARG_WITH(catman,
581 [ --with-catman=man|cat Install preformatted manpages[no]], 528 [ --with-catman=man|cat Install preformatted manpages[no]],
582 [ 529 [
@@ -769,3 +716,5 @@ if test ! -z "$MAIL" ; then
769fi 716fi
770 717
771AC_OUTPUT(Makefile) 718AC_OUTPUT(Makefile)
719
720
diff --git a/ssh.c b/ssh.c
index bf0ac6bd8..351997aba 100644
--- a/ssh.c
+++ b/ssh.c
@@ -11,7 +11,7 @@
11 */ 11 */
12 12
13#include "includes.h" 13#include "includes.h"
14RCSID("$Id: ssh.c,v 1.18 2000/01/22 23:32:04 damien Exp $"); 14RCSID("$Id: ssh.c,v 1.19 2000/02/07 02:20:26 damien Exp $");
15 15
16#include "xmalloc.h" 16#include "xmalloc.h"
17#include "ssh.h" 17#include "ssh.h"
@@ -217,10 +217,6 @@ main(int ac, char **av)
217 /* Save our own name. */ 217 /* Save our own name. */
218 av0 = av[0]; 218 av0 = av[0];
219 219
220#ifdef SOCKS
221 SOCKSinit(av0);
222#endif /* SOCKS */
223
224 /* Initialize option structure to indicate that no values have been set. */ 220 /* Initialize option structure to indicate that no values have been set. */
225 initialize_options(&options); 221 initialize_options(&options);
226 222
diff --git a/ssh.h b/ssh.h
index 390f463e5..281ef1388 100644
--- a/ssh.h
+++ b/ssh.h
@@ -13,7 +13,7 @@
13 * 13 *
14 */ 14 */
15 15
16/* RCSID("$Id: ssh.h,v 1.25 2000/01/22 23:32:04 damien Exp $"); */ 16/* RCSID("$Id: ssh.h,v 1.26 2000/02/07 02:20:26 damien Exp $"); */
17 17
18#ifndef SSH_H 18#ifndef SSH_H
19#define SSH_H 19#define SSH_H
@@ -752,97 +752,4 @@ extern int IPv4or6;
752#include "auth-pam.h" 752#include "auth-pam.h"
753#endif /* USE_PAM */ 753#endif /* USE_PAM */
754 754
755#if defined(HAVE_DANTE) || defined(HAVE_SOCKS4)
756/*
757 * The following defines map the normal socket operations to SOCKSified
758 * versions coming from the Dante SOCKS package.
759 */
760#define accept Raccept
761#define bind Rbind
762#define bindresvport Rbindresvport
763#define connect Rconnect
764#define gethostbyname Rgethostbyname
765#define gethostbyname2 Rgethostbyname2
766#define getpeername Rgetpeername
767#define getsockname Rgetsockname
768#define read Rread
769#define readv Rreadv
770#define recv Rrecv
771#define recvmsg Rrecvmsg
772#define recvfrom Rrecvfrom
773#define rresvport Rrresvport
774#define send Rsend
775#define sendmsg Rsendmsg
776#define sendto Rsendto
777#define write Rwrite
778#define writev Rwritev
779int Raccept (int, struct sockaddr *, socklen_t *);
780int Rbind (int, const struct sockaddr *, socklen_t);
781int Rbindresvport(int , struct sockaddr_in *);
782int Rconnect (int, const struct sockaddr *, socklen_t);
783struct hostent *Rgethostbyname(const char *);
784struct hostent *Rgethostbyname2(const char *, int);
785int Rgetpeername (int, struct sockaddr *, socklen_t *);
786int Rgetsockname (int, struct sockaddr *, socklen_t *);
787ssize_t Rread(int , void *, size_t );
788ssize_t Rreadv(int d, const struct iovec *iov, int iovcnt);
789ssize_t Rrecv (int, void *, size_t, int);
790ssize_t Rrecvfrom (int, void *, size_t, int, struct sockaddr *,
791 socklen_t *);
792ssize_t Rsend (int, const void *, size_t, int);
793ssize_t Rsendmsg (int, const struct msghdr *, int);
794ssize_t Rsendto (int, const void *,
795 size_t, int, const struct sockaddr *, socklen_t);
796ssize_t Rwrite(int , const void *, size_t );
797ssize_t Rwritev(int , const struct iovec *, int );
798#endif /* HAVE_DANTE || HAVE_SOCKS4 */
799
800#if defined(HAVE_SOCKS5)
801/*
802 * The following defines map the normal socket operations to SOCKSified
803 * versions coming from the SOCKS package.
804 */
805#define accept SOCKSaccept
806#define bind SOCKSbind
807#define bindresvport SOCKSbindresvport
808#define connect SOCKSconnect
809#define gethostbyname SOCKSgethostbyname
810#define gethostbyname2 SOCKSgethostbyname2
811#define getpeername SOCKSgetpeername
812#define getsockname SOCKSgetsockname
813#define read SOCKSread
814#define readv SOCKSreadv
815#define recv SOCKSrecv
816#define recvmsg SOCKSrecvmsg
817#define recvfrom SOCKSrecvfrom
818#define rresvport SOCKSrresvport
819#define send SOCKSsend
820#define sendmsg SOCKSsendmsg
821#define sendto SOCKSsendto
822#define write SOCKSwrite
823#define writev SOCKSwritev
824int SOCKSaccept (int, struct sockaddr *, socklen_t *);
825int SOCKSbind (int, const struct sockaddr *, socklen_t);
826int SOCKSbindresvport(int , struct sockaddr_in *);
827int SOCKSconnect (int, const struct sockaddr *, socklen_t);
828struct hostent *SOCKSgethostbyname(const char *);
829struct hostent *SOCKSgethostbyname2(const char *, int);
830int SOCKSgetpeername (int, struct sockaddr *, socklen_t *);
831int SOCKSgetsockname (int, struct sockaddr *, socklen_t *);
832ssize_t SOCKSread(int , void *, size_t );
833ssize_t SOCKSreadv(int d, const struct iovec *iov, int iovcnt);
834ssize_t SOCKSrecv (int, void *, size_t, int);
835ssize_t SOCKSrecvfrom (int, void *, size_t, int, struct sockaddr *,
836 socklen_t *);
837ssize_t SOCKSsend (int, const void *, size_t, int);
838ssize_t SOCKSsendmsg (int, const struct msghdr *, int);
839ssize_t SOCKSsendto (int, const void *,
840 size_t, int, const struct sockaddr *, socklen_t);
841ssize_t SOCKSwrite(int , const void *, size_t );
842ssize_t SOCKSwritev(int , const struct iovec *, int );
843#endif /* SOCKS5 */
844
845#if defined(DANTE) || defined(SOCKS4) || defined(SOCKS5)
846#define SOCKS
847#endif /* defined(DANTE) || defined(SOCKS4) || defined(SOCKS5) */
848#endif /* SSH_H */ 755#endif /* SSH_H */