From 861fea25d666c811b950b6335434843948424564 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sat, 25 Nov 2017 22:34:13 +0100 Subject: [PATCH] More default socket path fixes --- apache/mod_authn_subauth.c | 2 +- apache/mod_authn_subauth.conf | 2 +- pam/pam_subauth.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apache/mod_authn_subauth.c b/apache/mod_authn_subauth.c index a8d706a..c830d07 100644 --- 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 287ab23..e292d05 100644 --- 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 # diff --git a/pam/pam_subauth.c b/pam/pam_subauth.c index 2cb32b3..4664996 100644 --- 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), }; -- 2.39.2