last XDG change: use GNUNET_RUNTIME_DIR instead of /tmp for UNIXPATHs by default

12 files changed, 157 insertions, 157 deletions

diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index 08b08762d..064ac619e 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -8,45 +8,45 @@ GNUNET_TEST_HOME = /tmp/c_bootstrap_server/
 PRIVATE_KEY = hostkeys/c_bootstrap_server
 
 [arm]
-UNIXPATH = /tmp/test-service-arm-4
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-4
 PORT = 20004
 
 [dns]
-UNIXPATH = /tmp/test-service-dns-5
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-5
 
 [core]
-UNIXPATH = /tmp/test-service-core-3
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-3
 PORT = 20003
 
 [ats]
-UNIXPATH = /tmp/test-service-ats-9
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-9
 PORT = 20012
 
 [mesh]
-UNIXPATH = /tmp/test-service-mesh-13
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-13
 PORT = 20016
 
 [datastore]
-UNIXPATH = /tmp/test-service-datastore-11
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-11
 PORT = 20014
 
 [resolver]
-UNIXPATH = /tmp/test-service-resolver-14
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-14
 PORT = 20017
 
 [dht]
-UNIXPATH = /tmp/test-service-dht-1
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-1
 PORT = 20000
 
 [nat]
 BEHIND_NAT = NO
 
 [fs]
-UNIXPATH = /tmp/test-service-fs-6
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-6
 PORT = 20005
 
 [transport]
-UNIXPATH = /tmp/test-service-transport-8
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-8
 PORT = 20011
 
 [transport-tcp]
@@ -61,18 +61,18 @@ OPTIONS = -p
 SERVERs = 
 
 [vpn]
-UNIXPATH = /tmp/gnunet-service-vpn-15
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-15
 
 [peerinfo]
-UNIXPATH = /tmp/test-service-peerinfo-10
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-10
 PORT = 20013
 
 [statistics]
-UNIXPATH = /tmp/test-service-statistics-2
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-2
 PORT = 20001
 
 [nse]
-UNIXPATH = /tmp/test-service-nse-12
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-12
 PORT = 20015
 
 [transport-http]
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index 5f42f22e1..942360c93 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -1,35 +1,35 @@
 @INLINE@ confs/test_defaults.conf
 
 [arm]
-UNIXPATH = /tmp/test-service-arm-46
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46
 PORT = 20058
 
 [core]
-UNIXPATH = /tmp/test-service-core-45
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-45
 PORT = 20057
 
 [ats]
-UNIXPATH = /tmp/test-service-ats-51
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-51
 PORT = 20066
 
 [datastore]
-UNIXPATH = /tmp/test-service-datastore-53
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-53
 PORT = 20068
 
 [resolver]
-UNIXPATH = /tmp/test-service-resolver-56
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-56
 PORT = 20071
 
 [dht]
-UNIXPATH = /tmp/test-service-dht-43
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-43
 PORT = 20054
 
 [fs]
-UNIXPATH = /tmp/test-service-fs-48
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-48
 PORT = 20059
 
 [transport]
-UNIXPATH = /tmp/test-service-transport-50
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50
 PORT = 20065
 
 [transport-tcp]
@@ -43,10 +43,10 @@ PORT = 0
 SERVERS = http://localhost:8080/
 
 [dv]
-UNIXPATH = /tmp/test-service-dv-b_nat_c-1
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_nat_c-1
 
 [peerinfo]
-UNIXPATH = /tmp/test-service-peerinfo-52
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-52
 PORT = 20067
 
 [PATHS]
@@ -56,7 +56,7 @@ GNUNET_TEST_HOME = /tmp/c_nat_client
 PRIVATE_KEY = hostkeys/c_nat_client
 
 [nse]
-UNIXPATH = /tmp/test-service-nse-54
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-54
 PORT = 20069
 
 [transport-http]
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index 87daeb41d..f03e118d8 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -8,14 +8,14 @@ PRIVATE_KEY = hostkeys/c_no_nat_client
 
 [arm]
 DEFAULTSERVICES = topology hostlist dht nse mesh fs
-UNIXPATH = /tmp/test-service-arm-18
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
 PORT = 20022
 
 [namestore]
 AUTOSTART = YES
 
 [dns]
-UNIXPATH = /tmp/test-service-dns-19
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
 
 [consensus]
 AUTOSTART = YES
@@ -24,29 +24,29 @@ AUTOSTART = YES
 AUTOSTART = YES
 
 [core]
-UNIXPATH = /tmp/test-service-core-17
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17
 PORT = 20021
 
 [ats]
-UNIXPATH = /tmp/test-service-ats-23
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-23
 WAN_QUOTA_IN = 64 KiB
 WAN_QUOTA_OUT = 64 KiB
 PORT = 20030
 
 [mesh]
-UNIXPATH = /tmp/test-service-mesh-27
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-27
 PORT = 20034
 
 [datastore]
-UNIXPATH = /tmp/test-service-datastore-25
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-25
 PORT = 20032
 
 [resolver]
-UNIXPATH = /tmp/test-service-resolver-28
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-28
 PORT = 20035
 
 [dht]
-UNIXPATH = /tmp/test-service-dht-15
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-15
 PORT = 20018
 
 [dhtcache]
@@ -61,12 +61,12 @@ DISABLEV6 = NO
 PORT = 20020
 
 [fs]
-UNIXPATH = /tmp/test-service-fs-20
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-20
 PORT = 20023
 
 [transport]
 PLUGINS = tcp udp
-UNIXPATH = /tmp/test-service-transport-22
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22
 UNIX_MATCH_UID = NO
 PORT = 20029
 
@@ -83,26 +83,26 @@ SERVERS = http://localhost:8080/
 
 [vpn]
 BINARY = gnunet-service-vpn
-UNIXPATH = /tmp/gnunet-service-vpn-29
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29
 
 [dv]
-UNIXPATH = /tmp/test-service-dv-b_no_nat_c-1
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_c-1
 
 [peerinfo]
-UNIXPATH = /tmp/test-service-peerinfo-24
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-24
 USE_INCLUDED_HELLOS = YES
 PORT = 20031
 
 [statistics]
-UNIXPATH = /tmp/test-service-statistics-16
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-16
 PORT = 20019
 
 [template]
 PORT = 20024
-UNIXPATH = /tmp/test-service-template-21
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-21
 
 [nse]
-UNIXPATH = /tmp/test-service-nse-26
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-26
 UNIX_MATCH_UID = NO
 WORKBITS = 22
 PORT = 20033
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 46f0ddd24..b475ff284 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -1,37 +1,37 @@
 @INLINE@ confs/test_defaults.conf
 
 [arm]
-UNIXPATH = /tmp/test-service-arm-32
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-32
 PORT = 20040
 
 [dns]
-UNIXPATH = /tmp/test-service-dns-33
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-33
 
 [lockmanager]
 AUTOSTART = YES
 
 [core]
-UNIXPATH = /tmp/test-service-core-31
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-31
 PORT = 20039
 
 [ats]
-UNIXPATH = /tmp/test-service-ats-37
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-37
 PORT = 20048
 
 [mesh]
-UNIXPATH = /tmp/test-service-mesh-41
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-41
 PORT = 20052
 
 [datastore]
-UNIXPATH = /tmp/test-service-datastore-39
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-39
 PORT = 20050
 
 [resolver]
-UNIXPATH = /tmp/test-service-resolver-42
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-42
 PORT = 20053
 
 [dht]
-UNIXPATH = /tmp/test-service-dht-29
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-29
 PORT = 20036
 
 [nat]
@@ -41,11 +41,11 @@ BEHIND_NAT = NO
 PORT = 20038
 
 [fs]
-UNIXPATH = /tmp/test-service-fs-34
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-34
 PORT = 20041
 
 [transport]
-UNIXPATH = /tmp/test-service-transport-36
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-36
 PORT = 20047
 
 [transport-tcp]
@@ -59,17 +59,17 @@ PORT = 20045
 SERVERS = http://localhost:8080/
 
 [vpn]
-UNIXPATH = /tmp/gnunet-service-vpn.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn.sock
 
 [dv]
-UNIXPATH = /tmp/test-service-dv-b_no_nat_c-2
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_c-2
 
 [peerinfo]
-UNIXPATH = /tmp/test-service-peerinfo-38
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-38
 PORT = 20049
 
 [statistics]
-UNIXPATH = /tmp/test-service-statistics-30
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-30
 PORT = 20037
 
 [PATHS]
@@ -81,10 +81,10 @@ PRIVATE_KEY = hostkeys/c_no_nat_client_2
 
 [template]
 PORT = 20042
-UNIXPATH = /tmp/test-service-template-35
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-35
 
 [nse]
-UNIXPATH = /tmp/test-service-nse-40
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-40
 PORT = 20051
 
 [transport-http]
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 67ed37ea6..8f1f776a5 100644
--- a/src/integration-tests/confs/c_no_nat_client_http.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http.conf
@@ -1,36 +1,36 @@
 [arm]
 DEFAULTSERVICES = topology hostlist fs core
-UNIXPATH = /tmp/test-service-arm-18
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
 PORT = 20022
 
 [dns]
-UNIXPATH = /tmp/test-service-dns-19
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
 
 [lockmanager]
 AUTOSTART = YES
 
 [core]
-UNIXPATH = /tmp/test-service-core-17
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17
 PORT = 20021
 
 [ats]
-UNIXPATH = /tmp/test-service-ats-23
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-23
 PORT = 20030
 
 [mesh]
-UNIXPATH = /tmp/test-service-mesh-27
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-27
 PORT = 20034
 
 [datastore]
-UNIXPATH = /tmp/test-service-datastore-25
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-25
 PORT = 20032
 
 [resolver]
-UNIXPATH = /tmp/test-service-resolver-28
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-28
 PORT = 20035
 
 [dht]
-UNIXPATH = /tmp/test-service-dht-15
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-15
 PORT = 20018
 
 [nat]
@@ -40,12 +40,12 @@ BEHIND_NAT = NO
 PORT = 20020
 
 [fs]
-UNIXPATH = /tmp/test-service-fs-20
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-20
 PORT = 20023
 
 [transport]
 PLUGINS = http
-UNIXPATH = /tmp/test-service-transport-22
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22
 PORT = 20029
 
 [transport-tcp]
@@ -59,18 +59,18 @@ PORT = 20027
 SERVERS = http://localhost:8080/
 
 [vpn]
-UNIXPATH = /tmp/gnunet-service-vpn-29
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29
 
 [dv]
-UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-1
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_http_c-1
 
 [peerinfo]
-UNIXPATH = /tmp/test-service-peerinfo-24
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-24
 USE_INCLUDED_HELLOS = YES
 PORT = 20031
 
 [statistics]
-UNIXPATH = /tmp/test-service-statistics-16
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-16
 PORT = 20019
 
 [PATHS]
@@ -79,10 +79,10 @@ DEFAULTCONFIG = c_no_nat_client_http.conf
 
 [template]
 PORT = 20024
-UNIXPATH = /tmp/test-service-template-21
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-21
 
 [nse]
-UNIXPATH = /tmp/test-service-nse-26
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-26
 PORT = 20033
 
 [transport-http]
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 a581d7f02..c10b042f5 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
@@ -2,37 +2,37 @@
 
 [arm]
 DEFAULTSERVICES = topology hostlist fs core
-UNIXPATH = /tmp/test-service-arm-32
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-32
 PORT = 20040
 
 [dns]
-UNIXPATH = /tmp/test-service-dns-33
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-33
 
 [lockmanager]
 AUTOSTART = YES
 
 [core]
-UNIXPATH = /tmp/test-service-core-31
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-31
 PORT = 20039
 
 [ats]
-UNIXPATH = /tmp/test-service-ats-37
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-37
 PORT = 20048
 
 [mesh]
-UNIXPATH = /tmp/test-service-mesh-41
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-41
 PORT = 20052
 
 [datastore]
-UNIXPATH = /tmp/test-service-datastore-39
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-39
 PORT = 20050
 
 [resolver]
-UNIXPATH = /tmp/test-service-resolver-42
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-42
 PORT = 20053
 
 [dht]
-UNIXPATH = /tmp/test-service-dht-29
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-29
 PORT = 20036
 
 [nat]
@@ -42,12 +42,12 @@ BEHIND_NAT = NO
 PORT = 20038
 
 [fs]
-UNIXPATH = /tmp/test-service-fs-34
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-34
 PORT = 20041
 
 [transport]
 PLUGINS = http
-UNIXPATH = /tmp/test-service-transport-36
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-36
 PORT = 20047
 
 [transport-tcp]
@@ -61,18 +61,18 @@ PORT = 20045
 SERVERS = http://localhost:8080/
 
 [vpn]
-UNIXPATH = /tmp/gnunet-service-vpn.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn.sock
 
 [dv]
-UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-2
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_http_c-2
 
 [peerinfo]
-UNIXPATH = /tmp/test-service-peerinfo-38
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-38
 USE_INCLUDED_HELLOS = YES
 PORT = 20049
 
 [statistics]
-UNIXPATH = /tmp/test-service-statistics-30
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-30
 PORT = 20037
 
 [PATHS]
@@ -81,10 +81,10 @@ DEFAULTCONFIG = c_no_nat_client_http_2.conf
 
 [template]
 PORT = 20042
-UNIXPATH = /tmp/test-service-template-35
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-35
 
 [nse]
-UNIXPATH = /tmp/test-service-nse-40
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-40
 PORT = 20051
 
 [transport-http]
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 c1129b519..1321b0c35 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix.conf
@@ -2,37 +2,37 @@
 
 [arm]
 DEFAULTSERVICES = topology hostlist fs core
-UNIXPATH = /tmp/test-service-arm-18
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
 PORT = 20022
 
 [dns]
-UNIXPATH = /tmp/test-service-dns-19
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
 
 [lockmanager]
 AUTOSTART = YES
 
 [core]
-UNIXPATH = /tmp/test-service-core-17
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17
 PORT = 20021
 
 [ats]
-UNIXPATH = /tmp/test-service-ats-23
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-23
 PORT = 20030
 
 [mesh]
-UNIXPATH = /tmp/test-service-mesh-27
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-27
 PORT = 20034
 
 [datastore]
-UNIXPATH = /tmp/test-service-datastore-25
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-25
 PORT = 20032
 
 [resolver]
-UNIXPATH = /tmp/test-service-resolver-28
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-28
 PORT = 20035
 
 [dht]
-UNIXPATH = /tmp/test-service-dht-15
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-15
 PORT = 20018
 
 [nat]
@@ -42,12 +42,12 @@ BEHIND_NAT = NO
 PORT = 20020
 
 [fs]
-UNIXPATH = /tmp/test-service-fs-20
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-20
 PORT = 20023
 
 [transport]
 PLUGINS = unix tcp udp http
-UNIXPATH = /tmp/test-service-transport-22
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22
 PORT = 20029
 
 [transport-unix]
@@ -64,18 +64,18 @@ PORT = 20027
 SERVERS = http://localhost:8080/
 
 [vpn]
-UNIXPATH = /tmp/gnunet-service-vpn-29
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29
 
 [dv]
-UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-1
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_unix_c-1
 
 [peerinfo]
-UNIXPATH = /tmp/test-service-peerinfo-24
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-24
 USE_INCLUDED_HELLOS = YES
 PORT = 20031
 
 [statistics]
-UNIXPATH = /tmp/test-service-statistics-16
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-16
 PORT = 20019
 
 [PATHS]
@@ -84,10 +84,10 @@ DEFAULTCONFIG = c_no_nat_client_unix.conf
 
 [template]
 PORT = 20024
-UNIXPATH = /tmp/test-service-template-21
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-21
 
 [nse]
-UNIXPATH = /tmp/test-service-nse-26
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-26
 PORT = 20033
 
 [gnunetd]
@@ -100,5 +100,5 @@ PORT = 0
 PORT = 20025
 
 [chat]
-UNIXPATH = /tmp/test-service-chat-b_no_nat_unix_c-1
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-chat-b_no_nat_unix_c-1
 
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 f4d91d336..67f0e0d76 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
@@ -2,37 +2,37 @@
 
 [arm]
 DEFAULTSERVICES = topology hostlist fs core
-UNIXPATH = /tmp/test-service-arm-32
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-32
 PORT = 20040
 
 [dns]
-UNIXPATH = /tmp/test-service-dns-33
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-33
 
 [lockmanager]
 AUTOSTART = YES
 
 [core]
-UNIXPATH = /tmp/test-service-core-31
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-31
 PORT = 20039
 
 [ats]
-UNIXPATH = /tmp/test-service-ats-37
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-37
 PORT = 20048
 
 [mesh]
-UNIXPATH = /tmp/test-service-mesh-41
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-41
 PORT = 20052
 
 [datastore]
-UNIXPATH = /tmp/test-service-datastore-39
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-39
 PORT = 20050
 
 [resolver]
-UNIXPATH = /tmp/test-service-resolver-42
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-42
 PORT = 20053
 
 [dht]
-UNIXPATH = /tmp/test-service-dht-29
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-29
 PORT = 20036
 
 [nat]
@@ -42,12 +42,12 @@ BEHIND_NAT = NO
 PORT = 20038
 
 [fs]
-UNIXPATH = /tmp/test-service-fs-34
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-34
 PORT = 20041
 
 [transport]
 PLUGINS = unix tcp udp http
-UNIXPATH = /tmp/test-service-transport-36
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-36
 PORT = 20047
 
 [transport-tcp]
@@ -61,18 +61,18 @@ PORT = 20045
 SERVERS = http://localhost:8080/
 
 [vpn]
-UNIXPATH = /tmp/gnunet-service-vpn.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn.sock
 
 [dv]
-UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-2
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_unix_c-2
 
 [peerinfo]
-UNIXPATH = /tmp/test-service-peerinfo-38
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-38
 USE_INCLUDED_HELLOS = YES
 PORT = 20049
 
 [statistics]
-UNIXPATH = /tmp/test-service-statistics-30
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-30
 PORT = 20037
 
 [PATHS]
@@ -81,10 +81,10 @@ DEFAULTCONFIG = c_no_nat_client_unix_2.conf
 
 [template]
 PORT = 20042
-UNIXPATH = /tmp/test-service-template-35
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-35
 
 [nse]
-UNIXPATH = /tmp/test-service-nse-40
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-40
 PORT = 20051
 
 [transport-http]
diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf
index ca8d684cc..54d8b050d 100644
--- a/src/integration-tests/confs/c_normal_client_tcp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp.conf
@@ -1,35 +1,35 @@
 @INLINE@ confs/test_defaults.conf
 
 [arm]
-UNIXPATH = /tmp/test-service-arm-46
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46
 PORT = 20058
 
 [core]
-UNIXPATH = /tmp/test-service-core-45
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-45
 PORT = 20057
 
 [ats]
-UNIXPATH = /tmp/test-service-ats-51
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-51
 PORT = 20066
 
 [datastore]
-UNIXPATH = /tmp/test-service-datastore-53
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-53
 PORT = 20068
 
 [resolver]
-UNIXPATH = /tmp/test-service-resolver-56
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-56
 PORT = 20071
 
 [dht]
-UNIXPATH = /tmp/test-service-dht-43
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-43
 PORT = 20054
 
 [fs]
-UNIXPATH = /tmp/test-service-fs-48
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-48
 PORT = 20059
 
 [transport]
-UNIXPATH = /tmp/test-service-transport-50
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50
 PORT = 20065
 
 [transport-tcp]
@@ -40,7 +40,7 @@ ADVERTISED_PORT = 20064
 PORT = 0
 
 [peerinfo]
-UNIXPATH = /tmp/test-service-peerinfo-52
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-52
 USE_INCLUDED_HELLOS = YES
 PORT = 20067
 
@@ -48,7 +48,7 @@ PORT = 20067
 GNUNET_TEST_HOME = /tmp/c_normal_client
 
 [nse]
-UNIXPATH = /tmp/test-service-nse-54
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-54
 PORT = 20069
 
 [gnunetd]
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 5aaf8ee51..40757ba1b 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
@@ -1,39 +1,39 @@
 @INLINE@ confs/test_defaults.conf
 
 [arm]
-UNIXPATH = /tmp/test-service-arm-46
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46
 PORT = 20058
 
 [lockmanager]
 AUTOSTART = YES
 
 [core]
-UNIXPATH = /tmp/test-service-core-45
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-45
 PORT = 20057
 
 [ats]
-UNIXPATH = /tmp/test-service-ats-51
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-51
 PORT = 20066
 
 [datastore]
-UNIXPATH = /tmp/test-service-datastore-53
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-53
 PORT = 20068
 
 [resolver]
-UNIXPATH = /tmp/test-service-resolver-56
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-56
 PORT = 20071
 
 [dht]
-UNIXPATH = /tmp/test-service-dht-43
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-43
 PORT = 20054
 
 [fs]
-UNIXPATH = /tmp/test-service-fs-48
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-48
 PORT = 20059
 
 [transport]
 PLUGINS = tcp udp
-UNIXPATH = /tmp/test-service-transport-50
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50
 PORT = 20065
 
 [transport-tcp]
@@ -44,7 +44,7 @@ ADVERTISED_PORT = 20064
 PORT = 0
 
 [peerinfo]
-UNIXPATH = /tmp/test-service-peerinfo-52
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-52
 USE_INCLUDED_HELLOS = YES
 PORT = 20067
 
@@ -52,7 +52,7 @@ PORT = 20067
 GNUNET_TEST_HOME = /tmp/c_normal_client
 
 [nse]
-UNIXPATH = /tmp/test-service-nse-54
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-54
 PORT = 20069
 
 [transport-http]
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 7b01fc9a3..5a70d9d4c 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
@@ -1,39 +1,39 @@
 @INLINE@ confs/test_defaults.conf
 
 [arm]
-UNIXPATH = /tmp/test-service-arm-46
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46
 PORT = 20058
 
 [lockmanager]
 AUTOSTART = YES
 
 [core]
-UNIXPATH = /tmp/test-service-core-45
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-45
 PORT = 20057
 
 [ats]
-UNIXPATH = /tmp/test-service-ats-51
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-51
 PORT = 20066
 
 [datastore]
-UNIXPATH = /tmp/test-service-datastore-53
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-53
 PORT = 20068
 
 [resolver]
-UNIXPATH = /tmp/test-service-resolver-56
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-56
 PORT = 20071
 
 [dht]
-UNIXPATH = /tmp/test-service-dht-43
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-43
 PORT = 20054
 
 [fs]
-UNIXPATH = /tmp/test-service-fs-48
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-48
 PORT = 20059
 
 [transport]
 PLUGINS = tcp udp http
-UNIXPATH = /tmp/test-service-transport-50
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50
 PORT = 20065
 
 [transport-tcp]
@@ -44,10 +44,10 @@ ADVERTISED_PORT = 20064
 PORT = 0
 
 [dv]
-UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp_udp_http
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_c_normal_client_tcp_udp_http
 
 [peerinfo]
-UNIXPATH = /tmp/test-service-peerinfo-52
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-52
 USE_INCLUDED_HELLOS = YES
 PORT = 20067
 
@@ -55,7 +55,7 @@ PORT = 20067
 GNUNET_TEST_HOME = /tmp/c_normal_client
 
 [nse]
-UNIXPATH = /tmp/test-service-nse-54
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-54
 PORT = 20069
 
 [transport-http]
diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf
index b1f3c33be..eb9722915 100644
--- a/src/integration-tests/confs/test_defaults.conf
+++ b/src/integration-tests/confs/test_defaults.conf
@@ -5,7 +5,7 @@ DEFAULTSERVICES = topology hostlist fs
 AUTOSTART = NO
 
 [dns]
-UNIXPATH = /tmp/test-service-dns-47
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-47
 PORT = 0
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -24,7 +24,7 @@ ATS_MIN_INTERVAL = 15000
 ATS_EXEC_INTERVAL = 30000
 
 [mesh]
-UNIXPATH = /tmp/test-service-mesh-55
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-55
 PORT = 20070
 
 [datastore]
@@ -67,14 +67,14 @@ USE_LOCALADDR = YES
 SERVERS = 
 
 [vpn]
-UNIXPATH = /tmp/gnunet-service-vpn-57
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-57
 PORT = 0
 
 [peerinfo]
 USE_INCLUDED_HELLOS = NO
 
 [statistics]
-UNIXPATH = /tmp/test-service-statistics-44
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-44
 PORT = 20055
 
 [template]