3 files changed, 4 insertions, 4 deletions

diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index b9a33242f..e9bf82e9f 100644
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -7,7 +7,7 @@ BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 DEFAULTSERVICES = topology hostlist dht nse mesh fs
-UNIXPATH = /tmp/gnunet-service-arm.sock
+UNIXPATH = $SERVICEHOME/gnunet-service-arm.sock
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 906f0adde..ab1fe6481 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -622,8 +622,8 @@ create_listen_socket (struct sockaddr *sa, socklen_t addr_len,
                          "setsockopt");
 #endif
 
-  if (GNUNET_NETWORK_socket_bind
-      (sock, (const struct sockaddr *) sa, addr_len, 0) != GNUNET_OK)
+  if (GNUNET_OK !=
+      GNUNET_NETWORK_socket_bind (sock, (const struct sockaddr *) sa, addr_len))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   _
diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c
index bb30f22c6..557e81ee5 100644
--- a/src/arm/test_exponential_backoff.c
+++ b/src/arm/test_exponential_backoff.c
@@ -42,7 +42,7 @@
 
 #define BINARY "mockup-service"
 
-#define CFGFILENAME "test_arm_api_data.conf"
+#define CFGFILENAME "test_arm_api_data_copy.conf"
 
 
 static const struct GNUNET_CONFIGURATION_Handle *cfg;