[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36592 - in gnunet: . src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36592 - in gnunet: . src/util |
Date: |
Tue, 27 Oct 2015 12:12:14 +0100 |
Author: burdges
Date: 2015-10-27 12:12:14 +0100 (Tue, 27 Oct 2015)
New Revision: 36592
Modified:
gnunet/configure.ac
gnunet/src/util/Makefile.am
gnunet/src/util/test_socks.c
Log:
Use SSH more safely from configure
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2015-10-26 18:11:05 UTC (rev 36591)
+++ gnunet/configure.ac 2015-10-27 11:12:14 UTC (rev 36592)
@@ -202,6 +202,7 @@
AC_CHECK_PROG(VAR_SSH_BINARY,ssh,true,false)
AM_CONDITIONAL(HAVE_SSH_BINARY, $VAR_SSH_BINARY)
+AM_CONDITIONAL(HAVE_SSH_KEY, ssh -D 12345 -o "BatchMode yes" -o
"UserKnownHostsFile /tmp/gnunet_test_cosks_ssh_garbage" -o
"StrictHostKeyChecking no" 127.0.0.1 echo -n)
AC_CHECK_MEMBER(struct tm.tm_gmtoff,
Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2015-10-26 18:11:05 UTC (rev 36591)
+++ gnunet/src/util/Makefile.am 2015-10-27 11:12:14 UTC (rev 36592)
@@ -256,7 +256,7 @@
perf_malloc
endif
-if HAVE_SSH_BINARY
+if HAVE_SSH_KEY
SSH_USING_TESTS = test_socks.nc
endif
Modified: gnunet/src/util/test_socks.c
===================================================================
--- gnunet/src/util/test_socks.c 2015-10-26 18:11:05 UTC (rev 36591)
+++ gnunet/src/util/test_socks.c 2015-10-27 11:12:14 UTC (rev 36592)
@@ -186,13 +186,12 @@
if (pid == 0)
{
execlp ("ssh",
- "ssh",
- "-D",
- socksport,
- "127.0.0.1",
- "-N",
- NULL);
- perror ("execlp (\"ssh\",\"ssh\",\"-D\",\"1081\",\"127.0.0.1\",\"-N\") ");
+ "ssh","-D",socksport,
+ "-o","BatchMode yes",
+ "-o","UserKnownHostsFile /tmp/gnunet_test_socks_ssh_garbage",
+ "-o","StrictHostKeyChecking no",
+ "127.0.0.1","-N",(char*)NULL);
+ perror ("execlp (\"ssh\",\"ssh\",...,\"-D\",\"1081\",\"127.0.0.1\",\"-N\")
");
printf (""
"Please ensure you have ssh installed and have sshd installed and running :\n"
"\tsudo apt-get install openssh-client openssh-server\n"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36592 - in gnunet: . src/util,
gnunet <=