dslinux/user/dropbear Makefile options.h scp.c
stsp
stsp at user.in-berlin.de
Wed Aug 9 02:12:41 CEST 2006
Update of /cvsroot/dslinux/dslinux/user/dropbear
In directory antilope:/tmp/cvs-serv24506
Modified Files:
Makefile options.h scp.c
Log Message:
Enable scp.
Index: options.h
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/dropbear/options.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- options.h 22 Jul 2006 18:19:29 -0000 1.4
+++ options.h 9 Aug 2006 00:12:39 -0000 1.5
@@ -197,7 +197,7 @@
/* This is used by the scp binary when used as a client binary. If you're
* not using the Dropbear client, you'll need to change it */
-#define _PATH_SSH_PROGRAM "/usr/bin/dbclient"
+#define _PATH_SSH_PROGRAM "/usr/bin/ssh"
/* Multi-purpose binary configuration has now moved. Look at the top
* of the Makefile for instructions, or INSTALL */
Index: scp.c
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/dropbear/scp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- scp.c 22 May 2006 23:58:00 -0000 1.2
+++ scp.c 9 Aug 2006 00:12:39 -0000 1.3
@@ -200,7 +200,7 @@
#endif /* __uClinux__ */
/* Fork a child to execute the command on the remote host using ssh. */
-#ifndef __uClinux__
+#ifdef __uClinux__
do_cmd_pid = vfork();
#else
do_cmd_pid = fork();
@@ -227,7 +227,7 @@
perror(ssh_program);
exit(1);
} else if (do_cmd_pid == -1) {
- fatal("fork: %s", strerror(errno));
+ fatal("fork: %s\n", strerror(errno));
}
@@ -308,10 +308,13 @@
memset(&args, '\0', sizeof(args));
args.list = NULL;
addargs(&args, "%s", ssh_program);
+#if 0
+ /* These do not work with dbclient - stsp */
addargs(&args, "-x");
addargs(&args, "-oForwardAgent no");
addargs(&args, "-oPermitLocalCommand no");
addargs(&args, "-oClearAllForwardings yes");
+#endif
fflag = tflag = 0;
while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1)
Index: Makefile
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/dropbear/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 29 Jul 2006 06:28:51 -0000 1.3
+++ Makefile 9 Aug 2006 00:12:38 -0000 1.4
@@ -10,7 +10,10 @@
# Hopefully that seems intuitive.
ifndef PROGRAMS
- PROGRAMS=dropbear dbclient dropbearkey dropbearconvert
+ PROGRAMS=dropbear dbclient dropbearkey dropbearconvert scp
+endif
+ifndef SCPPROGRESS
+ SCPPROGRESS=1
endif
LTC=libtomcrypt/libtomcrypt.a
More information about the dslinux-commit
mailing list