summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/OS/os.h-Linux3
-rw-r--r--src/src/daemon.c59
-rw-r--r--src/src/expand.c24
-rw-r--r--src/src/queue.c12
4 files changed, 73 insertions, 25 deletions
diff --git a/src/OS/os.h-Linux b/src/OS/os.h-Linux
index 63cf9babd..25c013c5f 100644
--- a/src/OS/os.h-Linux
+++ b/src/OS/os.h-Linux
@@ -87,5 +87,8 @@ then change the 0 to 1 in the next block. */
# define TCPI_OPT_SYN_DATA 32
#endif
+/* "Abstract" Unix-socket names */
+#define EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
+
/* End */
diff --git a/src/src/daemon.c b/src/src/daemon.c
index bb9b32f4e..b4629bad5 100644
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -954,6 +954,19 @@ daemon_die(void)
{
int pid;
+if (daemon_notifier_fd >= 0)
+ {
+ close(daemon_notifier_fd);
+ daemon_notifier_fd = -1;
+#ifndef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
+ {
+ uschar * s = string_sprintf("%s/%s", spool_directory, NOTIFIER_SOCKET_NAME);
+ DEBUG(D_any) debug_printf("unlinking notifier socket %s\n", s);
+ Uunlink(s);
+ }
+#endif
+ }
+
if (f.running_in_test_harness || write_pid)
{
if ((pid = fork()) == 0)
@@ -985,11 +998,11 @@ const uschar * where;
struct sockaddr_un sun = {.sun_family = AF_UNIX};
int len;
-DEBUG(D_any) debug_printf("creating notifier socket\n");
+DEBUG(D_any) debug_printf("creating notifier socket ");
where = US"socket";
#ifdef SOCK_CLOEXEC
-if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0)
+if ((fd = socket(PF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0)
goto bad;
#else
if ((fd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0)
@@ -997,25 +1010,31 @@ if ((fd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0)
(void)fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
#endif
+#ifdef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
sun.sun_path[0] = 0; /* Abstract local socket addr - Linux-specific? */
len = offsetof(struct sockaddr_un, sun_path) + 1
+ snprintf(sun.sun_path+1, sizeof(sun.sun_path)-1, "%s", NOTIFIER_SOCKET_NAME);
+DEBUG(D_any) debug_printf("@%s\n", sun.sun_path+1);
+#else /* filesystem-visible and persistent; will neeed removal */
+len = offsetof(struct sockaddr_un, sun_path)
+ + snprintf(sun.sun_path, sizeof(sun.sun_path), "%s/%s",
+ spool_directory, NOTIFIER_SOCKET_NAME);
+DEBUG(D_any) debug_printf("%s\n", sun.sun_path);
+#endif
where = US"bind";
if (bind(fd, (const struct sockaddr *)&sun, len) < 0)
goto bad;
-where = US"SO_PASSCRED";
-if (setsockopt(fd, SOL_SOCKET,
#ifdef SO_PASSCRED /* Linux */
- SO_PASSCRED,
-#elif defined(LOCAL_CREDS) /* BSD-ish */
- LOCAL_CREDS,
-#else
-# error no SO_PASSCRED
-#endif
- &on, sizeof(on)) < 0)
+where = US"SO_PASSCRED";
+if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)) < 0)
goto bad;
+#elif defined(LOCAL_CREDS) /* FreeBSD-ish */
+where = US"LOCAL_CREDS";
+if (setsockopt(fd, SOL_SOCKET, LOCAL_CREDS, &on, sizeof(on)) < 0)
+ goto bad;
+#endif
/* debug_printf("%s: fd %d\n", __FUNCTION__, fd); */
daemon_notifier_fd = fd;
@@ -1053,8 +1072,10 @@ if (sz >= sizeof(buf)) return FALSE;
#ifdef notdef
debug_printf("addrlen %d\n", msg.msg_namelen);
#endif
-DEBUG(D_queue_run) debug_printf("%s from addr%s '%s'\n", __FUNCTION__,
- *sun.sun_path ? "" : " abstract", sun.sun_path+ (*sun.sun_path ? 0 : 1));
+DEBUG(D_queue_run) debug_printf("%s from addr '%s%.*s'\n", __FUNCTION__,
+ *sun.sun_path ? "" : "@",
+ (int)msg.msg_namelen - (*sun.sun_path ? 0 : 1),
+ sun.sun_path + (*sun.sun_path ? 0 : 1));
/* Refuse to handle the item unless the peer has good credentials */
#ifdef SCM_CREDENTIALS
@@ -1062,32 +1083,36 @@ DEBUG(D_queue_run) debug_printf("%s from addr%s '%s'\n", __FUNCTION__,
#elif defined(LOCAL_CREDS) && defined(SCM_CREDS)
# define EXIM_SCM_CR_TYPE SCM_CREDS
#else
-# error no SCM creds knowlege
+ /* The OS has no way to get the creds of the caller (for a unix/datagram socket.
+ Punt; don't try to check. */
#endif
+#ifdef EXIM_SCM_CR_TYPE
for (struct cmsghdr * cp = CMSG_FIRSTHDR(&msg);
cp;
cp = CMSG_NXTHDR(&msg, cp))
if (cp->cmsg_level == SOL_SOCKET && cp->cmsg_type == EXIM_SCM_CR_TYPE)
{
-#ifdef SCM_CREDENTIALS /* Linux */
+# ifdef SCM_CREDENTIALS /* Linux */
struct ucred * cr = (struct ucred *) CMSG_DATA(cp);
if (cr->uid && cr->uid != exim_uid)
{
DEBUG(D_queue_run) debug_printf("%s: sender creds pid %d uid %d gid %d\n",
__FUNCTION__, (int)cr->pid, (int)cr->uid, (int)cr->gid);
return FALSE;
-#elif defined(LOCAL_CREDS) /* BSD-ish */
+ }
+# elif defined(LOCAL_CREDS) /* BSD-ish */
struct sockcred * cr = (struct sockcred *) CMSG_DATA(cp);
if (cr->sc_uid && cr->sc_uid != exim_uid)
{
DEBUG(D_queue_run) debug_printf("%s: sender creds pid ??? uid %d gid %d\n",
__FUNCTION__, (int)cr->sc_uid, (int)cr->sc_gid);
return FALSE;
-#endif
}
+# endif
break;
}
+#endif
buf[sz] = 0;
switch (buf[0])
diff --git a/src/src/expand.c b/src/src/expand.c
index 427effedf..4af4a3652 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -1755,6 +1755,9 @@ uschar buf[16];
int fd;
ssize_t len;
const uschar * where;
+#ifndef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
+uschar * sname;
+#endif
if ((fd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0)
{
@@ -1762,28 +1765,34 @@ if ((fd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0)
return NULL;
}
-#define ABSTRACT_CLIENT
-#ifdef ABSTRACT_CLIENT
+#ifdef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
sun.sun_path[0] = 0; /* Abstract local socket addr - Linux-specific? */
len = offsetof(struct sockaddr_un, sun_path) + 1
+ snprintf(sun.sun_path+1, sizeof(sun.sun_path)-1, "exim_%d", getpid());
#else
+sname = string_sprintf("%s/p_%d", spool_directory, getpid());
len = offsetof(struct sockaddr_un, sun_path)
- + snprintf(sun.sun_path, sizeof(sun.sun_path), "%s/p_%d",
- spool_directory, getpid());
+ + snprintf(sun.sun_path, sizeof(sun.sun_path), "%s", sname);
#endif
if (bind(fd, (const struct sockaddr *)&sun, len) < 0)
{ where = US"bind"; goto bad; }
#ifdef notdef
-debug_printf("local%s '%s'\n", *sun.sun_path ? "" : " abstract",
- sun.sun_path+ (*sun.sun_path ? 0 : 1));
+debug_printf("local addr '%s%s'\n",
+ *sun.sun_path ? "" : "@",
+ sun.sun_path + (*sun.sun_path ? 0 : 1));
#endif
+#ifdef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
sun.sun_path[0] = 0; /* Abstract local socket addr - Linux-specific? */
len = offsetof(struct sockaddr_un, sun_path) + 1
+ snprintf(sun.sun_path+1, sizeof(sun.sun_path)-1, "%s", NOTIFIER_SOCKET_NAME);
+#else
+len = offsetof(struct sockaddr_un, sun_path)
+ + snprintf(sun.sun_path, sizeof(sun.sun_path), "%s/%s",
+ spool_directory, NOTIFIER_SOCKET_NAME);
+#endif
if (connect(fd, (const struct sockaddr *)&sun, len) < 0)
{ where = US"connect"; goto bad; }
@@ -1794,6 +1803,9 @@ if (send(fd, buf, 1, 0) < 0) { where = US"send"; goto bad; }
if ((len = recv(fd, buf, sizeof(buf), 0)) < 0) { where = US"recv"; goto bad; }
close(fd);
+#ifndef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
+Uunlink(sname);
+#endif
return string_copyn(buf, len);
bad:
diff --git a/src/src/queue.c b/src/src/queue.c
index ac7aad1a0..4452163d0 100644
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -475,7 +475,7 @@ for (int i = queue_run_in_order ? -1 : 0;
if (f.queue_2stage && !queue_run_in_order)
{
int i;
- if (qpid[nelem(qpid) - 1])
+ if (qpid[f.running_in_test_harness ? 0 : nelem(qpid) - 1])
{
DEBUG(D_queue_run) debug_printf("q2stage waiting for child\n");
waitpid(qpid[0], NULL, 0);
@@ -1524,12 +1524,20 @@ memcpy(buf+1, msgid, MESSAGE_ID_LENGTH+1);
if ((fd = socket(AF_UNIX, SOCK_DGRAM, 0)) >= 0)
{
struct sockaddr_un sun = {.sun_family = AF_UNIX};
+ int slen;
+
+#ifdef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
int len = offsetof(struct sockaddr_un, sun_path) + 1
+ snprintf(sun.sun_path+1, sizeof(sun.sun_path)-1, "%s",
NOTIFIER_SOCKET_NAME);
sun.sun_path[0] = 0;
+#else
+ int len = offsetof(struct sockaddr_un, sun_path)
+ + snprintf(sun.sun_path, sizeof(sun.sun_path), "%s/%s",
+ spool_directory, NOTIFIER_SOCKET_NAME);
+#endif
- if (sendto(fd, buf, sizeof(buf), 0, &sun, len) < 0)
+ if (sendto(fd, buf, sizeof(buf), 0, (struct sockaddr *)&sun, len) < 0)
DEBUG(D_queue_run)
debug_printf("%s: sendto %s\n", __FUNCTION__, strerror(errno));
close(fd);
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 08:49:48 +0000