mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-23 09:17:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

- biorn@cvs.openbsd.org 2006/03/16 10:31:45

Browse Source 
[scp.c]
     Try to display errormessage even if remout == -1
     ok djm@, markus@
This commit is contained in:
Damien Miller 2006-03-26 13:49:43 +11:00
parent cb314828eb
commit 745570cd79
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -4,6 +4,10 @@
[ssh-keygen.c]
if no key file are given when printing the DNS host record, use the
host key file(s) as default. ok djm@
- biorn@cvs.openbsd.org 2006/03/16 10:31:45
[scp.c]
Try to display errormessage even if remout == -1
ok djm@, markus@
20060325
- OpenBSD CVS Sync
@ -4261,4 +4265,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4242 2006/03/26 02:48:01 djm Exp $
$Id: ChangeLog,v 1.4243 2006/03/26 02:49:43 djm Exp $

18
scp.c
View File

@ -1106,15 +1106,15 @@ run_err(const char *fmt,...)
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 || (remout != -1 && (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);