- upgrade to 4.0p1,

[packages/openssh.git] / openssh-sigpipe.patch

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
@@ -104,6 +104,9 @@
  */
 extern char *host;
 
+/* if we process SIGPIPE */
+extern int enable_sigpipe;
+
 /*
  * 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 @@
 		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);
 
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
@@ -235,6 +235,8 @@
              that enable them to authenticate using the identities loaded into
              the agent.
 
+     -B      Enable SIGPIPE processing.
+
      -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)
 .Sh SYNOPSIS
 .Nm ssh
-.Op Fl 1246AaCfgkMNnqsTtVvXxY
+.Op Fl 1246AaBCfgkMNnqsTtVvXxY
 .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.
+.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
+port/X11 forwarding when used.
 .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
@@ -135,6 +135,9 @@
 /* Should we execute a command or invoke a subsystem? */
 int subsystem_flag = 0;
 
+/* Enable sigpipe */
+int enable_sigpipe = 0;
+
 /* # of replies received for global requests */
 static int client_global_request_id = 0;
 
@@ -236,7 +239,7 @@
 
 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) {
 		switch (opt) {
 		case '1':
 			options.protocol = SSH_PROTO_1;
@@ -279,6 +282,9 @@
 		case 'A':
 			options.forward_agent = 1;
 			break;
+		case 'B':
+			enable_sigpipe = 1;
+			break;
 		case 'k':
 			options.gss_deleg_creds = 0;
 			break;