head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.50 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.48 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.46 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.44 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.42 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.40 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.38 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.36 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.34 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.32 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.30 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.28 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.26 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.24 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.22 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.20 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.18 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.16 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.14 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.12 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.10 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.8 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.6 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.4 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.2 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.1; locks; strict; comment @# @; 1.3 date 2004.06.01.21.50.38; author kristerw; state dead; branches; next 1.2; 1.2 date 2000.03.20.02.25.56; author itojun; state Exp; branches; next 1.1; 1.1 date 99.12.25.05.28.37; author kim; state Exp; branches; next ; desc @@ 1.3 log @Remove obsolete packages, per discussion on tech-pkg. @ text @$NetBSD: patch-bi,v 1.2 2000/03/20 02:25:56 itojun Exp $ --- ssh.c- Wed May 12 20:19:28 1999 +++ ssh.c Mon Mar 20 09:47:32 2000 @@@@ -280,9 +280,9 @@@@ fprintf(stderr, " -l user Log in using this user name.\n"); fprintf(stderr, " -n Redirect input from /dev/null.\n"); fprintf(stderr, " -a Disable authentication agent forwarding.\n"); -#if defined(KERBEROS_TGT_PASSING) && defined(KRB5) - fprintf(stderr, " -k Disable Kerberos ticket passing.\n"); -#endif /* defined(KERBEROS_TGT_PASSING) && defined(KRB5) */ +#ifdef AFS + fprintf(stderr, " -k Disable Kerberos ticket and AFS token passing.\n"); +#endif /* AFS */ #ifndef SSH_NO_X11_FORWARDING fprintf(stderr, " -x Disable X11 connection forwarding.\n"); #endif @@@@ -541,6 +541,9 @@@@ case 'k': options.kerberos_tgt_passing = 0; +#ifdef AFS + options.afs_token_passing = 0; +#endif /* AFS */ break; case 'i': @ 1.2 log @split security/ssh and security/ssh6. security/ssh6: IPv4/v6 ready, socks unavailable, kerberos available (not tested) security/ssh: IPv4 onlyready, socks available, kerberos available (not tested) should be integrated into one whenever socks support becomes aware of getaddrinfo/getnameinfo. two directories with tons of patches/patch-* is a maintenance headache. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Folded in IPv6 and Kerberos IV patches, so that both can be compiled. This also fixes problems with Kerberos IV and V support clashing (you still have to choose one or the other at compile time, though). Compiles and runs on 1.4O -- needs testing on 1.4.2, and also some closer looking at certain patches (e.g. patch-au has a "#if 0" that could maybe be something else). @ text @d3 3 a5 28 --- ssh.c.orig Wed May 12 07:19:28 1999 +++ ssh.c Fri Dec 24 21:50:42 1999 @@@@ -218,6 +218,14 @@@@ other functions. */ RandomState random_state; +/* Flag indicating whether IPv4 or IPv6. This can be set on the command line. + Default value is AF_UNSPEC means both IPv4 and IPv6. */ +#ifdef ENABLE_IPV6 +int IPv4or6 = AF_UNSPEC; +#else +int IPv4or6 = AF_INET; +#endif + /* Flag indicating whether debug mode is on. This can be set on the command line. */ int debug_flag = 0; @@@@ -277,12 +285,19 @@@@ { fprintf(stderr, "Usage: %s [options] host [command]\n", av0); fprintf(stderr, "Options:\n"); + fprintf(stderr, " -4 Use IPv4 only.\n"); +#ifdef ENABLE_IPV6 + fprintf(stderr, " -6 Use IPv6 only.\n"); +#endif +#ifdef ENABLE_ANOTHER_PORT_TRY + fprintf(stderr, " -A Try to connect to another port before original port.\n"); +#endif /* ENABLE_ANOTHER_PORT_TRY */ d18 1 a18 38 @@@@ -413,6 +428,9 @@@@ #ifdef SIGWINCH struct winsize ws; #endif /* SIGWINCH */ +#ifdef ENABLE_ANOTHER_PORT_TRY + int another_port_flag = 0; +#endif /* ENABLE_ANOTHER_PORT_TRY */ /* Save the original real uid. It will be needed later (uid-swapping may clobber the real uid). */ @@@@ -522,6 +540,26 @@@@ } switch (opt) { + case '4': +#ifdef ENABLE_IPV6 + IPv4or6 = (IPv4or6 == AF_INET6) ? AF_UNSPEC : AF_INET; +#else + IPv4or6 = AF_INET; +#endif + break; + +#ifdef ENABLE_IPV6 + case '6': + IPv4or6 = (IPv4or6 == AF_INET) ? AF_UNSPEC : AF_INET6; + break; +#endif + +#ifdef ENABLE_ANOTHER_PORT_TRY + case 'A': + another_port_flag = 1; + break; +#endif /* ENABLE_ANOTHER_PORT_TRY */ + case 'n': stdin_null_flag = 1; break; @@@@ -541,6 +579,9 @@@@ a27 19 @@@@ -789,11 +830,18 @@@@ { use_privileged_port = 0; } +#ifdef ENABLE_ANOTHER_PORT_TRY + if (!another_port_flag) + options.another_port = 0; +#endif /* ENABLE_ANOTHER_PORT_TRY */ /* Open a connection to the remote host. This needs root privileges if rhosts_authentication is true. Note that the random_state is not yet used by this call, although a pointer to it is stored, and thus it need not be initialized. */ ok = ssh_connect(host, options.port, options.connection_attempts, +#ifdef ENABLE_ANOTHER_PORT_TRY + options.another_port, +#endif /* ENABLE_ANOTHER_PORT_TRY */ !use_privileged_port, original_real_uid, options.proxy_command, &random_state); @