diff options
author | ng0 <ng0@n0.is> | 2019-04-03 11:19:44 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-04-03 11:19:44 +0000 |
commit | 838d77b984be30b14e5fe94dd857a8ef1d0351ec (patch) | |
tree | d16e840792296057f303e517303451710e268a40 /src | |
parent | 56b6543511d41f44a05b6966293e45a8f0c39712 (diff) | |
parent | 63dcaed7c14b636b6175843520f13ba1b9a8ea1b (diff) | |
download | gnunet-838d77b984be30b14e5fe94dd857a8ef1d0351ec.tar.gz gnunet-838d77b984be30b14e5fe94dd857a8ef1d0351ec.zip |
Merge branch 'master' of gnunet.org:gnunet
Diffstat (limited to 'src')
-rw-r--r-- | src/integration-tests/Makefile.am | 4 | ||||
-rw-r--r-- | src/pt/test_gns_vpn.c | 2 | ||||
-rw-r--r-- | src/pt/test_gns_vpn.conf | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index 368980064..26dd4f92d 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am | |||
@@ -20,8 +20,8 @@ check_SCRIPTS = \ | |||
20 | test_integration_disconnect.py \ | 20 | test_integration_disconnect.py \ |
21 | test_integration_disconnect_nat.py \ | 21 | test_integration_disconnect_nat.py \ |
22 | test_integration_reconnect.py \ | 22 | test_integration_reconnect.py \ |
23 | test_integration_reconnect_nat.py \ | 23 | test_integration_reconnect_nat.py |
24 | test_integration_clique.py | 24 | # test_integration_clique.py |
25 | endif | 25 | endif |
26 | 26 | ||
27 | 27 | ||
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c index 05fab18be..069277a00 100644 --- a/src/pt/test_gns_vpn.c +++ b/src/pt/test_gns_vpn.c | |||
@@ -11,7 +11,7 @@ | |||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Affero General Public License for more details. | 13 | Affero General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Affero General Public License | 15 | You should have received a copy of the GNU Affero General Public License |
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | 17 | ||
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf index 85dd08113..9277aa3c3 100644 --- a/src/pt/test_gns_vpn.conf +++ b/src/pt/test_gns_vpn.conf | |||
@@ -7,8 +7,6 @@ PLUGINS = tcp | |||
7 | [arm] | 7 | [arm] |
8 | PORT = 0 | 8 | PORT = 0 |
9 | ALLOW_SHUTDOWN = YES | 9 | ALLOW_SHUTDOWN = YES |
10 | START_SYSTEM_SERVICES = NO | ||
11 | START_USER_SERVICES = NO | ||
12 | 10 | ||
13 | [exit] | 11 | [exit] |
14 | IMMEDIATE_START = YES | 12 | IMMEDIATE_START = YES |