Make socket path a configure option

The kernel uses the fixed path named /var/run/gssproxy.sock
Make this default a configure time option and default to it.
Also remove the option to change the socket at configure time,
neither the kernel nor proxymech.so can cope with a change anyway.

2 files changed, 13 insertions, 23 deletions

diff --git a/proxy/src/client/gpm_common.c b/proxy/src/client/gpm_common.c
index 3d062b2..d3dbaff 100644
--- a/proxy/src/client/gpm_common.c
+++ b/proxy/src/client/gpm_common.c
@@ -63,15 +63,11 @@ static void gpm_init_once(void)
     pthread_mutexattr_destroy(&attr);
 }
 
-#define GP_SOCKET_NAME "gssproxy.socket"
-
 static int get_pipe_name(struct gpm_ctx *gpmctx, char *name)
 {
     int ret;
 
-    /* TODO: get socket name from config file */
-
-    ret = snprintf(name, PATH_MAX, "%s/%s", PIPE_PATH, GP_SOCKET_NAME);
+    ret = snprintf(name, PATH_MAX, "%s", GP_SOCKET_NAME);
     if (ret < 0 || ret >= PATH_MAX) {
         return ENAMETOOLONG;
     }
diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c
index 20e1b73..e5878c0 100644
--- a/proxy/src/gp_config.c
+++ b/proxy/src/gp_config.c
@@ -31,8 +31,6 @@
 #include "gp_proxy.h"
 #include "iniparser.h"
 
-#define GP_SOCKET_NAME "gssproxy.socket"
-
 static void gp_service_free(struct gp_service *svc)
 {
     free(svc->name);
@@ -274,22 +272,6 @@ int load_config(struct gp_config *cfg)
         }
     }
 
-    tmpstr = iniparser_getstring(d, "gssproxy:socket", NULL);
-    if (tmpstr) {
-        cfg->socket_name = strdup(tmpstr);
-        if (!cfg->socket_name) {
-            ret = ENOMEM;
-            goto done;
-        }
-    } else {
-        ret = asprintf(&cfg->socket_name, "%s/%s",
-                        PIPE_PATH, GP_SOCKET_NAME);
-        if (ret == -1) {
-            ret = ENOMEM;
-            goto done;
-        }
-    }
-
     cfg->num_workers = iniparser_getint(d, "gssproxy:worker threads", 0);
 
     ret = load_services(cfg, d);
@@ -323,6 +305,12 @@ struct gp_config *read_config(char *config_file, int opt_daemonize)
         }
     }
 
+    cfg->socket_name = strdup(GP_SOCKET_NAME);
+    if (cfg->socket_name == NULL) {
+        ret = ENOMEM;
+        goto done;
+    }
+
     switch (opt_daemonize) {
     case 0:
         /* daemonize by default */
@@ -339,6 +327,12 @@ struct gp_config *read_config(char *config_file, int opt_daemonize)
         GPDEBUG("Config file not found! Proceeding with defaults.");
     }
 
+done:
+    if (ret) {
+        free_config(cfg);
+        cfg = NULL;
+    }
+
     return cfg;
 }