@@ -104,45 +104,51 @@ int localserver(const struct optstruct *opts)

     strncpy(server.sun_path, optget(opts, "LocalSocket")->strarg, sizeof(server.sun_path));

     server.sun_path[sizeof(server.sun_path)-1]='\0';

-    cnt = 0;

-    sockdir = NULL;

-    pos = server.sun_path + strlen(server.sun_path);

-    while (pos != server.sun_path) {

-        if (*pos == '/') {

-            sockdir = strndup(server.sun_path, strlen(server.sun_path) - cnt);

-            break;

-        }

-        else {

-            pos--;

-            cnt++;

+    pos = NULL;

+    if ((pos = strstr(server.sun_path, "/")) && (pos = strstr(((char*) pos + 1), "/"))) {

+        cnt = 0;

+        sockdir = NULL;

+        pos = server.sun_path + strlen(server.sun_path);

+        while (pos != server.sun_path) {

+            if (*pos == '/') {

+                sockdir = strndup(server.sun_path, strlen(server.sun_path) - cnt);

+                break;

+            }

+            else {

+                pos--;

+                cnt++;

+            }

         }

-    }

-    if (stat(sockdir, &sb)) {

-        if (errno == ENOENT) {

-            mode_t sock_mode;

-            if(optget(opts, "LocalSocketMode")->enabled) {

-                char *end;

-                sock_mode = strtol(optget(opts, "LocalSocketMode")->strarg, &end, 8);

-

-                if(*end) {

-                    logg("!Invalid LocalSocketMode %s\n", optget(opts, "LocalSocketMode")->strarg);

-                    free(sockdir);

-                    return -1;

+        if (stat(sockdir, &sb)) {

+            if (errno == ENOENT) {

+                mode_t sock_mode;

+                if(optget(opts, "LocalSocketMode")->enabled) {

+                    char *end;

+                    sock_mode = strtol(optget(opts, "LocalSocketMode")->strarg, &end, 8);

+

+                    if(*end) {

+                        logg("!Invalid LocalSocketMode %s\n", optget(opts, "LocalSocketMode")->strarg);

+                        free(sockdir);

+                        return -1;

+                    }

+                } else {

+                    sock_mode = 0777;

                 }

-            } else {

-                sock_mode = 0777;

-            }

-            if (mkdir(sockdir, sock_mode)) {

-                logg("!LOCAL: Could not create socket directory: %s, %s\n", sockdir, strerror(errno));

-            }

-            else {

-                logg("LOCAL: Creating socket directory: %s\n", sockdir);

+                if (mkdir(sockdir, sock_mode)) {

+                    logg("!LOCAL: Could not create socket directory: %s: %s\n", sockdir, strerror(errno));

+                    if (errno == ENOENT) {

+                        logg("!LOCAL: Ensure parent directory exists.\n");

+                    }

+                }

+                else {

+                    logg("Localserver: Creating socket directory: %s\n", sockdir);

+                }

             }

         }

+        free(sockdir);

     }

-    free(sockdir);

     if((sockfd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {

 	estr = strerror(errno);