[scp.c]
If copying multiple files to a target file (which normally fails, as it
must be a target directory), kill the spawned ssh child before exiting.
This stops it trying to authenticate and spewing lots of output.
deraadt@ ok
arpa/nameser.h.
- (dtucker) [configure.ac openbsd-compat/Makefile.in openbsd-compat/strtoll.c]
Add strtoll to the compat library, from OpenBSD.
arpa/nameser.h.
- (dtucker) [configure.ac openbsd-compat/Makefile.in openbsd-compat/strtoll.c]
Add strtoll to the compat library, from OpenBSD.
+ - (dtucker) OpenBSD CVS Sync
+ - avsm@cvs.openbsd.org 2005/05/26 02:08:05
+ [scp.c]
+ If copying multiple files to a target file (which normally fails, as it
+ must be a target directory), kill the spawned ssh child before exiting.
+ This stops it trying to authenticate and spewing lots of output.
+ deraadt@ ok
20050531
- (dtucker) [contrib/aix/pam.conf] Correct comments. From davidl at
20050531
- (dtucker) [contrib/aix/pam.conf] Correct comments. From davidl at
-RCSID("$OpenBSD: scp.c,v 1.122 2005/05/24 17:32:43 avsm Exp $");
+RCSID("$OpenBSD: scp.c,v 1.123 2005/05/26 02:08:05 avsm Exp $");
#include "xmalloc.h"
#include "atomicio.h"
#include "xmalloc.h"
#include "atomicio.h"
killchild(int signo)
{
if (do_cmd_pid > 1) {
killchild(int signo)
{
if (do_cmd_pid > 1) {
- kill(do_cmd_pid, signo);
+ kill(do_cmd_pid, signo ? signo : SIGTERM);
waitpid(do_cmd_pid, NULL, 0);
}
waitpid(do_cmd_pid, NULL, 0);
}
+ if (signo)
+ _exit(1);
+ exit(1);
errno = ENOTDIR;
}
run_err("%s: %s", cp, strerror(errno));
errno = ENOTDIR;
}
run_err("%s: %s", cp, strerror(errno));