head	1.2;
access;
symbols
	RELEASE_7_4_0:1.1
	RELEASE_8_2_0:1.1
	RELEASE_6_EOL:1.1
	RELEASE_8_1_0:1.1
	RELEASE_7_3_0:1.1
	RELEASE_8_0_0:1.1
	RELEASE_7_2_0:1.1
	RELEASE_7_1_0:1.1
	RELEASE_6_4_0:1.1
	RELEASE_5_EOL:1.1
	RELEASE_7_0_0:1.1
	RELEASE_6_3_0:1.1
	PRE_XORG_7:1.1
	RELEASE_4_EOL:1.1
	RELEASE_6_2_0:1.1
	RELEASE_6_1_0:1.1
	RELEASE_5_5_0:1.1
	RELEASE_6_0_0:1.1
	RELEASE_5_4_0:1.1
	RELEASE_4_11_0:1.1
	RELEASE_5_3_0:1.1
	RELEASE_4_10_0:1.1
	RELEASE_5_2_1:1.1
	RELEASE_5_2_0:1.1
	RELEASE_4_9_0:1.1
	RELEASE_5_1_0:1.1
	RELEASE_4_8_0:1.1
	RELEASE_5_0_0:1.1
	RELEASE_4_7_0:1.1
	RELEASE_4_6_2:1.1
	RELEASE_4_6_1:1.1
	ssh_1_2_33:1.1
	ssh_1_2_32:1.1
	ssh_1_2_31:1.1
	ssh_1_2_30:1.1
	ssh_1_2_29:1.1
	ssh_1_2_28:1.1
	ssh_1_2_27:1.1
	RELEASE_4_6_0:1.1
	RELEASE_5_0_DP1:1.1
	RELEASE_4_5_0:1.1
	RELEASE_4_4_0:1.1
	RELEASE_4_3_0:1.1
	RELEASE_4_2_0:1.1
	RELEASE_4_1_1:1.1
	RELEASE_4_1_0:1.1
	RELEASE_3_5_0:1.1
	RELEASE_4_0_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2011.05.01.20.14.19;	author bapt;	state dead;
branches;
next	1.1;

1.1
date	2000.01.14.19.37.38;	author torstenb;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove unmaintained expired ports from security

2011-05-01 security/aafid2: Upstream disapear and distfile is no more available
2011-05-01 security/bjorb: Upstream disapear and distfile is no more available
2011-05-01 security/borzoi: Upstream disapear and distfile is no more available
2011-05-01 security/cmd5checkpw: Upstream disapear and distfile is no more available
2011-05-01 security/cops: Upstream disapear and distfile is no more available
2011-05-01 security/find_ddos: Upstream disapear and distfile is no more available
2011-05-01 security/ftpmap: Upstream disapear and distfile is no more available
2011-05-01 security/hafiye: Upstream disapear and distfile is no more available
2011-05-01 security/ident2: Upstream disapear and distfile is no more available
2011-05-01 security/liedentd: Upstream disapear and distfile is no more available
2011-05-01 security/pam_pop3: Upstream disapear and distfile is no more available
2011-05-01 security/poc: Upstream disapear and distfile is no more available
2011-05-01 security/portscanner: Upstream disapear and distfile is no more available
2011-05-01 security/ppgen: Upstream disapear and distfile is no more available
2011-05-01 security/qident: Upstream disapear and distfile is no more available
2011-05-01 security/quintuple-agent: Upstream disapear and distfile is no more available
2011-05-01 security/rc5pipe: Upstream disapear and distfile is no more available
2011-05-01 security/rid: Upstream disapear and distfile is no more available
2011-05-01 security/ssh: Upstream disapear and distfile is no more available
2011-05-01 security/tea-total: Upstream disapear and distfile is no more available
2011-05-01 security/uberkey: Upstream disapear and distfile is no more available
@
text
@*** ssh.c.orig	Wed May 12 13:19:28 1999
--- ssh.c	Mon Jan 10 22:56:13 2000
***************
*** 218,223 ****
--- 218,231 ----
     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,282 ****
--- 285,297 ----
  {
    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 */
    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");
***************
*** 413,418 ****
--- 428,436 ----
  #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,527 ****
--- 540,565 ----
          }
        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;
***************
*** 789,799 ****
--- 827,844 ----
      {
        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);
  
@


1.1
log
@Add IPv6 support to ssh.
The IPv6 patch was obtained from the kame repository and has been
been writen by KIKUCHI Takahiro <kick@@kyoto.wide.ad.jp>

Due to the whole mess with different patches it was necessary to include
both the IPv6 patch and patch-ssh-1.2.27-bsd.tty.chown in ${PATCHDIR}.
Since both patches modify the configure script it was also necessary
to rebuild it via autoconf from configure.in. I've decided to use
USE_AUTOCONF instead of including the re-build configure script in
${FILESDIR}

Obtained from:	KAME/WIDE
@
text
@@

