X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Futil.conf;h=6b9c52d004d88351e4a5b921f469edec9e84a8ef;hb=225ea594e86e56160b0f89b5cace24291cc6184b;hp=73c2829ac5715478ba11f3cb8843f610abd527b3;hpb=6d8afda4cb37037588fa1ac2bb6e5a23e9863ead;p=oweals%2Fgnunet.git

diff --git a/src/util/util.conf b/src/util/util.conf
index 73c2829ac..6b9c52d00 100644
--- a/src/util/util.conf
+++ b/src/util/util.conf
@@ -24,7 +24,18 @@ GNUNET_CONFIG_HOME = ${XDG_CONFIG_HOME:-$GNUNET_HOME/.config}/gnunet/
 GNUNET_CACHE_HOME = ${XDG_CACHE_HOME:-$GNUNET_HOME/.cache}/gnunet/
 
 # Runtime data (i.e UNIX domain sockets, locks, always lost on system boot)
-GNUNET_RUNTIME_DIR = ${XDG_RUNTIME_DIR:-${TMPDIR:-${TMP:-/tmp}}}/gnunet-${USERHOME:-${USER:gnunet}}/
+# This is the variable for system-wide services; use GNUNET_USER_RUNTIME_DIR
+# for per-user services (where USER_SERVICE=YES is set)
+# Note that the 'gnunet'/system user must have $TMPDIR/$TMP set to
+# exactly the same values as 'normal' users, otherwise this will fail.
+# If $TMPDIR or $TMP are set to different directories for different
+# users, this option should be changed to point to the same directory
+# for all users (i.e. by simply using "/tmp/gnunet-system-runtime/").
+GNUNET_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/gnunet-system-runtime/
+
+# Runtime data for per-user services
+GNUNET_USER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/gnunet-${USERHOME:-${USER:-user}}-runtime/
+
 
 # Legacy option...
 # GNUNET_TEST_HOME = ~/.gnunet/
@@ -43,3 +54,8 @@ PRIVATE_KEY = $GNUNET_DATA_HOME/private_key.ecc
 [TESTING]
 SPEEDUP_INTERVAL = 0 ms
 SPEEDUP_DELTA = 0 ms
+# This following option is applicable to LINUX.  Enabling this option causes all
+# UNIX domain sockets to be opened as abstract sockets.  Note that the
+# filesystem level restrictions no longer apply for abstract sockets.  An
+# end-user should not modify this option.
+USE_ABSTRACT_SOCKETS = NO