-diff -urN openssh-3.9p1.org/clientloop.c openssh-3.9p1/clientloop.c
---- openssh-3.9p1.org/clientloop.c 2004-08-17 19:03:29.093601408 +0200
-+++ openssh-3.9p1/clientloop.c 2004-08-17 19:03:41.803669184 +0200
+--- openssh-4.0p1/clientloop.c.orig 2005-03-01 11:24:33.000000000 +0100
++++ openssh-4.0p1/clientloop.c 2005-03-10 15:10:05.000000000 +0100
@@ -104,6 +104,9 @@
*/
extern char *host;
/*
* Flag to indicate that we have received a window change signal which has
* not yet been processed. This will cause a message indicating the new
-@@ -1202,6 +1205,8 @@
+@@ -1236,6 +1239,8 @@
signal(SIGQUIT, signal_handler);
if (signal(SIGTERM, SIG_IGN) != SIG_IGN)
signal(SIGTERM, signal_handler);
+ if (enable_sigpipe)
+ signal(SIGPIPE, signal_handler);
- if (have_pty)
- signal(SIGWINCH, window_change_handler);
+ signal(SIGWINCH, window_change_handler);
+ if (have_pty)
diff -urN openssh-3.9p1.org/ssh.0 openssh-3.9p1/ssh.0
--- openssh-3.9p1.org/ssh.0 2004-08-17 19:03:29.327565840 +0200
+++ openssh-3.9p1/ssh.0 2004-08-17 19:03:41.809668272 +0200
-a Disables forwarding of the authentication agent connection.
-b bind_address
-diff -urN openssh-3.9p1.org/ssh.1 openssh-3.9p1/ssh.1
---- openssh-3.9p1.org/ssh.1 2004-08-17 19:03:29.208583928 +0200
-+++ openssh-3.9p1/ssh.1 2004-08-17 19:04:51.366094088 +0200
-@@ -43,7 +43,7 @@
- .Nd OpenSSH SSH client (remote login program)
+--- openssh-5.6p1/ssh.1~ 2010-08-24 14:05:48.000000000 +0300
++++ openssh-5.6p1/ssh.1 2010-08-24 14:06:57.879253682 +0300
+@@ -44,7 +44,7 @@
.Sh SYNOPSIS
.Nm ssh
--.Op Fl 1246AaCfgkMNnqsTtVvXxY
-+.Op Fl 1246AaBCfgkMNnqsTtVvXxY
+ .Bk -words
+-.Op Fl 1246AaCfGgKkMNnqsTtVvXxYy
++.Op Fl 1246AaBCfGgKkMNnqsTtVvXxYy
.Op Fl b Ar bind_address
.Op Fl c Ar cipher_spec
- .Bk -words
-@@ -443,6 +443,10 @@
- .It Fl b Ar bind_address
- Specify the interface to transmit from on machines with multiple
- interfaces or aliased addresses.
+ .Op Fl D Oo Ar bind_address : Oc Ns Ar port
+@@ -425,6 +425,10 @@
+ on the local machine as the source address
+ of the connection.
+ Only useful on systems with more than one address.
+.It Fl B
+Enables processing of SIGPIPE. Useful when using ssh output as input for
+another process, for example in a shell script. Be careful - it may break
.It Fl C
Requests compression of all data (including stdin, stdout, stderr, and
data for forwarded X11 and TCP/IP connections).
-diff -urN openssh-3.9p1.org/ssh.c openssh-3.9p1/ssh.c
---- openssh-3.9p1.org/ssh.c 2004-08-17 19:03:29.209583776 +0200
-+++ openssh-3.9p1/ssh.c 2004-08-17 19:04:36.765313744 +0200
+--- openssh-4.0p1/ssh.c.orig 2005-03-02 02:04:33.000000000 +0100
++++ openssh-4.0p1/ssh.c 2005-03-10 15:11:10.000000000 +0100
@@ -135,6 +135,9 @@
/* Should we execute a command or invoke a subsystem? */
int subsystem_flag = 0;
/* # of replies received for global requests */
static int client_global_request_id = 0;
-@@ -236,7 +239,7 @@
+@@ -199,7 +199,7 @@ static void
+ usage(void)
+ {
+ fprintf(stderr,
+-"usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
++"usage: ssh [-1246AaBCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
+ " [-D [bind_address:]port] [-E log_file] [-e escape_char]\n"
+ " [-F configfile] [-I pkcs11] [-i identity_file]\n"
+ " [-L [bind_address:]port:host:hostport] [-Q protocol_feature]\n"
+@@ -330,7 +330,7 @@ main(int ac, char **av)
- again:
- while ((opt = getopt(ac, av,
-- "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:MNPR:S:TVXY")) != -1) {
-+ "1246ab:c:e:fgi:kl:m:no:p:qstvxABCD:F:I:L:MNPR:S:TVXY")) != -1) {
+ again:
+ while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"
+- "ACD:E:F:GI:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
++ "ABCD:E:F:GI:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
switch (opt) {
case '1':
options.protocol = SSH_PROTO_1;
-@@ -279,6 +282,9 @@
+@@ -291,6 +294,9 @@
case 'A':
options.forward_agent = 1;
break;
projects / packages / openssh.git / blobdiff