projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Default notifier socket name to spooldir-dependent path even for abstract names
[exim.git]
/
src
/
src
/
expand.c
diff --git
a/src/src/expand.c
b/src/src/expand.c
index 3c3184347871c178e174c4a37f7605eade728f75..4377ea1aa2ed9e518a8047e8584e962674fa9126 100644
(file)
--- a/
src/src/expand.c
+++ b/
src/src/expand.c
@@
-1791,11
+1791,12
@@
debug_printf("local addr '%s%s'\n",
#ifdef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
sa_un.sun_path[0] = 0; /* Abstract local socket addr - Linux-specific? */
len = offsetof(struct sockaddr_un, sun_path) + 1
#ifdef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
sa_un.sun_path[0] = 0; /* Abstract local socket addr - Linux-specific? */
len = offsetof(struct sockaddr_un, sun_path) + 1
- + snprintf(sa_un.sun_path+1, sizeof(sa_un.sun_path)-1, "%s", NOTIFIER_SOCKET_NAME);
+ + snprintf(sa_un.sun_path+1, sizeof(sa_un.sun_path)-1, "%s",
+ expand_string(notifier_socket));
#else
len = offsetof(struct sockaddr_un, sun_path)
#else
len = offsetof(struct sockaddr_un, sun_path)
- + snprintf(sa_un.sun_path, sizeof(sa_un.sun_path), "%s
/%s
",
-
spool_directory, NOTIFIER_SOCKET_NAME
);
+ + snprintf(sa_un.sun_path, sizeof(sa_un.sun_path), "%s",
+
expand_string(notifier_socket)
);
#endif
if (connect(fd, (const struct sockaddr *)&sa_un, len) < 0)
#endif
if (connect(fd, (const struct sockaddr *)&sa_un, len) < 0)