Merge tag 'branchpoint-5.1' into release

[disorder] / lib / client-common.c

diff --git a/lib/client-common.c b/lib/client-common.c
index 11c17e265757022563f31070087cfc7ac6d0c76a..f88008ffe2e4b8a11e693d281f670d65585f1457 100644 (file)
--- a/lib/client-common.c
+++ b/lib/client-common.c
@@ -25,6 +25,7 @@
 #include <sys/un.h>
 #include <errno.h>
 #include <netdb.h>
 #include <sys/un.h>
 #include <errno.h>
 #include <netdb.h>

+#include <unistd.h>

 
 #include "log.h"
 #include "configuration.h"
 
 #include "log.h"
 #include "configuration.h"


@@ -43,7 +44,7 @@ socklen_t find_server(struct config *c,
   struct sockaddr *sa;
   struct sockaddr_un su;
   struct addrinfo *res = 0;
   struct sockaddr *sa;
   struct sockaddr_un su;
   struct addrinfo *res = 0;

-  char *name;
+  char *name = NULL;

   socklen_t len;
 
   if(c->connect.af != -1) {
   socklen_t len;
 
   if(c->connect.af != -1) {


@@ -53,7 +54,14 @@ socklen_t find_server(struct config *c,
     sa = res->ai_addr;
     len = res->ai_addrlen;
   } else {
     sa = res->ai_addr;
     len = res->ai_addrlen;
   } else {

-    name = config_get_file2(c, "socket");
+    /* use the private socket if possible (which it should be) */
+    name = config_get_file2(c, "private/socket");
+    if(access(name, R_OK) != 0) {
+      xfree(name);
+      name = NULL;
+    }
+    if(!name)
+      name = config_get_file2(c, "socket");

     if(strlen(name) >= sizeof su.sun_path) {
       disorder_error(errno, "socket path is too long");
       return -1;
     if(strlen(name) >= sizeof su.sun_path) {
       disorder_error(errno, "socket path is too long");
       return -1;


@@ -74,11 +82,10 @@ socklen_t find_server(struct config *c,
   return len;
 }
 
   return len;
 }
 

-/** @brief Marker for a command body */

 const char disorder__body[1];
 const char disorder__body[1];

-
-/** @brief Marker for a list of args */

 const char disorder__list[1];
 const char disorder__list[1];

+const char disorder__integer[1];
+const char disorder__time[1];

 
 /*
 Local Variables:
 
 /*
 Local Variables: