SOURCES: openssh-4.3p1-hpn11.patch - rediff with sigpipe patch

[glen]

Author: glen                         Date: Mon Feb 13 12:23:27 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- rediff with sigpipe patch

---- Files affected:
SOURCES:
   openssh-4.3p1-hpn11.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/openssh-4.3p1-hpn11.patch
diff -u SOURCES/openssh-4.3p1-hpn11.patch:1.1 SOURCES/openssh-4.3p1-hpn11.patch:1.2
--- SOURCES/openssh-4.3p1-hpn11.patch:1.1	Mon Feb 13 13:22:49 2006
+++ SOURCES/openssh-4.3p1-hpn11.patch	Mon Feb 13 13:23:22 2006
@@ -160,25 +160,33 @@
 diff -r -u -p1 openssh-4.3p1/ssh.c patch/ssh.c
 --- openssh-4.3p1/ssh.c	2005-12-31 00:33:37.000000000 -0500
 +++ patch/ssh.c	2006-02-01 07:02:41.000000000 -0500
-@@ -159,3 +159,3 @@ usage(void)
+@@ -160,7 +160,7 @@
+ usage(void)
+ {
  	fprintf(stderr,
--"usage: ssh [-1246AaCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
-+"usage: ssh [-1246AaCfgkMNnqRrsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
+-"usage: ssh [-1246AaBCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
++"usage: ssh [-1246AaBCfgkMNnqRrsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
  "           [-D [bind_address:]port] [-e escape_char] [-F configfile]\n"
+ "           [-i identity_file] [-L [bind_address:]port:host:hostport]\n"
+ "           [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n"
 @@ -165,2 +165,3 @@ usage(void)
  "           [-w tunnel:tunnel] [user@]hostname [command]\n"
 +"           [-r receive buffer size]\n"
  	);
-@@ -244,5 +245,8 @@ main(int ac, char **av)
+@@ -246,9 +246,12 @@
+ 	/* Parse command-line arguments. */
+ 	host = NULL;
  
-+        /* need to set options.tcp_rcv_buf to 0 */
-+        options.tcp_rcv_buf = 0;
-+ 
++	/* need to set options.tcp_rcv_buf to 0 */
++	options.tcp_rcv_buf = 0;
++
  again:
  	while ((opt = getopt(ac, av,
--	    "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:MNO:PR:S:TVw:XY")) != -1) {
-+	    "1246ab:c:e:fgi:kl:m:no:p:qr:stvxACD:F:I:L:MNO:PR:S:TVw:XY")) != -1) {
+-	    "1246ab:c:e:fgi:kl:m:no:p:qstvxABCD:F:I:L:MNO:PR:S:TVw:XY")) != -1) {
++	    "1246ab:c:e:fgi:kl:m:no:p:qr:stvxABCD:F:I:L:MNO:PR:S:TVw:XY")) != -1) {
  		switch (opt) {
+ 		case '1':
+ 			options.protocol = SSH_PROTO_1;
 @@ -497,2 +501,5 @@ again:
  			break;
 +		case 'r':
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/openssh-4.3p1-hpn11.patch?r1=1.1&r2=1.2&f=u