- confs

11 files changed, 66 insertions, 0 deletions

diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index 0b919f925..b68ac5a53 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -353,3 +353,8 @@ UNIX_MATCH_GID = YES
 DATABASE = sqlite
 QUOTA = 1 MB
 
+[gns]
+AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
\ No newline at end of file
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index 59fa0f787..3817404d1 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -8,6 +8,12 @@ HOSTKEY = hostkeys/0002-hostkey
 [client]
 HOME = $SERVICEHOME
 
+[gns]
+AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
+
 [vpn]
 AUTOSTART = YES
 PORT = 0
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index 4ec077c81..3181447bc 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -6,6 +6,12 @@ DEFAULTCONFIG = confs/c_no_nat_client.conf
 #HOSTKEY = $SERVICEHOME/.hostkey
 HOSTKEY = hostkeys/0001-hostkey 
 
+[gns]
+AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
+
 [vpn]
 AUTOSTART = YES
 PORT = 0
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf
index bd675d7d2..61a6a3bd5 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -342,3 +342,10 @@ UNIX_MATCH_GID = YES
 DATABASE = sqlite
 QUOTA = 1 MB
 
+[gns]
+AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
+
+
diff --git a/src/integration-tests/confs/c_no_nat_client_http.conf b/src/integration-tests/confs/c_no_nat_client_http.conf
index df9fd5f69..718794e24 100644
--- a/src/integration-tests/confs/c_no_nat_client_http.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http.conf
@@ -6,6 +6,12 @@ DEFAULTCONFIG = confs/c_no_nat_client_http.conf
 #HOSTKEY = $SERVICEHOME/.hostkey
 HOSTKEY = hostkeys/0001-hostkey 
 
+[gns]
+AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
+
 [vpn]
 AUTOSTART = YES
 PORT = 0
diff --git a/src/integration-tests/confs/c_no_nat_client_http_2.conf b/src/integration-tests/confs/c_no_nat_client_http_2.conf
index a825a82c7..3acb6b120 100644
--- a/src/integration-tests/confs/c_no_nat_client_http_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http_2.conf
@@ -6,6 +6,12 @@ DEFAULTCONFIG = confs/c_no_nat_client_http_2.conf
 #HOSTKEY = $SERVICEHOME/.hostkey
 HOSTKEY = hostkeys/0002-hostkey 
 
+[gns]
+AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
+
 [resolver]
 AUTOSTART = YES
 PORT = 20053
diff --git a/src/integration-tests/confs/c_no_nat_client_unix.conf b/src/integration-tests/confs/c_no_nat_client_unix.conf
index 9d1413d98..37c5ad66b 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix.conf
@@ -6,6 +6,12 @@ DEFAULTCONFIG = confs/c_no_nat_client_unix.conf
 #HOSTKEY = $SERVICEHOME/.hostkey
 HOSTKEY = hostkeys/0001-hostkey 
 
+[gns]
+AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
+
 [vpn]
 AUTOSTART = YES
 PORT = 0
diff --git a/src/integration-tests/confs/c_no_nat_client_unix_2.conf b/src/integration-tests/confs/c_no_nat_client_unix_2.conf
index 365035636..6bf8e8bf0 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix_2.conf
@@ -6,6 +6,12 @@ DEFAULTCONFIG = confs/c_no_nat_client_unix_2.conf
 #HOSTKEY = $SERVICEHOME/.hostkey
 HOSTKEY = hostkeys/0002-hostkey 
 
+[gns]
+AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
+
 [resolver]
 AUTOSTART = YES
 PORT = 20053
diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf
index dd873c4f9..45acdafb1 100644
--- a/src/integration-tests/confs/c_normal_client_tcp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp.conf
@@ -8,6 +8,12 @@ HOSTKEY = hostkeys/0002-hostkey
 [client]
 HOME = $SERVICEHOME
 
+[gns]
+AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
+
 [vpn]
 AUTOSTART = YES
 PORT = 0
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp.conf b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
index b2a42fea5..e568f1233 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
@@ -8,6 +8,12 @@ HOSTKEY = hostkeys/0002-hostkey
 [client]
 HOME = $SERVICEHOME
 
+[gns]
+AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
+
 [vpn]
 AUTOSTART = YES
 PORT = 0
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
index 453be3e38..93275bf91 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
@@ -8,6 +8,12 @@ HOSTKEY = hostkeys/0002-hostkey
 [client]
 HOME = $SERVICEHOME
 
+[gns]
+AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
+
 [vpn]
 AUTOSTART = YES
 PORT = 0