rpms/openssh/devel openssh-4.3p2-scp-print-err.patch, NONE, 1.1 openssh.spec, 1.87, 1.88

[fedora-cvs-commits at redhat.com]

Author: tmraz

Update of /cvs/dist/rpms/openssh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24811

Modified Files:
	openssh.spec 
Added Files:
	openssh-4.3p2-scp-print-err.patch 
Log Message:
* Tue Feb 21 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-2
- print error from scp if not remote (patch by Bjorn Augustsson #178923)


openssh-4.3p2-scp-print-err.patch:
 scp.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE openssh-4.3p2-scp-print-err.patch ---
--- openssh-4.3p2/scp.c.print-err	2006-02-13 15:06:01.000000000 +0100
+++ openssh-4.3p2/scp.c	2006-02-21 16:47:04.000000000 +0100
@@ -1097,15 +1097,15 @@
 	va_list ap;
 
 	++errs;
-	if (fp == NULL && !(fp = fdopen(remout, "w")))
-		return;
-	(void) fprintf(fp, "%c", 0x01);
-	(void) fprintf(fp, "scp: ");
-	va_start(ap, fmt);
-	(void) vfprintf(fp, fmt, ap);
-	va_end(ap);
-	(void) fprintf(fp, "\n");
-	(void) fflush(fp);
+	if (fp != NULL || (fp = fdopen(remout, "w"))) {
+		(void) fprintf(fp, "%c", 0x01);
+		(void) fprintf(fp, "scp: ");
+		va_start(ap, fmt);
+		(void) vfprintf(fp, fmt, ap);
+		va_end(ap);
+		(void) fprintf(fp, "\n");
+		(void) fflush(fp);
+	}
 
 	if (!iamremote) {
 		va_start(ap, fmt);


Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- openssh.spec	13 Feb 2006 14:11:40 -0000	1.87
+++ openssh.spec	21 Feb 2006 16:00:42 -0000	1.88
@@ -58,7 +58,7 @@
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
 Name: openssh
 Version: 4.3p2
-%define rel 1
+%define rel 2
 %if %{rescue}
 %define %{rel}rescue
 %else
@@ -83,6 +83,7 @@
 Patch22: openssh-3.9p1-askpass-keep-above.patch
 Patch23: openssh-3.9p1-no-log-signal.patch
 Patch24: openssh-4.3p1-fromto-remote.patch
+Patch25: openssh-4.3p2-scp-print-err.patch
 Patch27: openssh-4.2p1-pam-no-stack.patch
 Patch30: openssh-4.0p1-exit-deadlock.patch
 Patch31: openssh-3.9p1-skip-used.patch
@@ -205,6 +206,7 @@
 %patch22 -p1 -b .keep-above
 %patch23 -p1 -b .signal
 %patch24 -p1 -b .fromto-remote
+%patch25 -p1 -b .print-err
 %patch27 -p1 -b .stack
 %patch30 -p1 -b .exit-deadlock
 %patch31 -p1 -b .skip-used
@@ -450,6 +452,9 @@
 %endif
 
 %changelog
+* Tue Feb 21 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-2
+- print error from scp if not remote (patch by Bjorn Augustsson #178923)
+
 * Mon Feb 13 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-1
 - new version