More default socket path fixes

diff --git a/apache/mod_authn_subauth.c b/apache/mod_authn_subauth.c
index a8d706a5b7219acb4067fab0204d94c6f1255120..c830d076e083f144b3f7563a8b5d2461257149f6 100644 (file)
--- a/apache/mod_authn_subauth.c
+++ b/apache/mod_authn_subauth.c
@@ -51,7 +51,7 @@ static struct json_node *run_command(struct context *ctx, struct json_node *requ
                return NULL;
        }
 
-       const char *path = ctx->dir->socket ? : INSTALL_RUN_DIR "/subauthd.socket";
+       const char *path = ctx->dir->socket ? : INSTALL_RUN_DIR "/subauthd/subauthd.socket";
        struct sockaddr_un sun;
        sun.sun_family = AF_UNIX;
        if (strlen(path) >= sizeof(sun.sun_path)) {

diff --git a/apache/mod_authn_subauth.conf b/apache/mod_authn_subauth.conf
index 287ab23ca396c460ff92859496f023080ab1cb1c..e292d05446bf650a9ebe8f1d57f56ffa16fc927f 100644 (file)
--- a/apache/mod_authn_subauth.conf
+++ b/apache/mod_authn_subauth.conf
@@ -4,7 +4,7 @@
 #      AuthType basic
 #      AuthName "Prove yourself!"
 #      AuthBasicProvider subauth
-#      # SubAuthSocket /var/run/subauthd.socket
+#      # SubAuthSocket /var/run/subauthd/subauthd.socket
 #      SubAuthZone web
 #      Require valid-user
 # </Location>

diff --git a/pam/pam_subauth.c b/pam/pam_subauth.c
index 2cb32b3e9dc45264bf523d4beb145aca81571aea..4664996305d8f267cfb60bc81c04949039f29d29 100644 (file)
--- a/pam/pam_subauth.c
+++ b/pam/pam_subauth.c
@@ -147,7 +147,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, int argc, const ch
     .pamh = pamh,
     .debug = 0,
     .use_first_pass = 0,
-    .socket_path = INSTALL_RUN_DIR "/subauthd.socket",
+    .socket_path = INSTALL_RUN_DIR "/subauthd/subauthd.socket",
     .zone = "default",
     .pool = mp_new(4096),
   };