X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fdaemon.c;h=265ee2bb6bd4acc8f8f3fc591b8ca72efaf22bb3;hb=f254e59264330fee415229fe8af2fa974d1d3a10;hp=b6c27ffe592066970888e1be5c5dd9554dbb24ff;hpb=4c2efd7a1bc5b018f2e05a0d739fd856967e3de7;p=exim.git

diff --git a/src/src/daemon.c b/src/src/daemon.c
index b6c27ffe5..265ee2bb6 100644
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -983,6 +983,7 @@ daemon_notifier_socket(void)
 int fd;
 const uschar * where;
 struct sockaddr_un sun = {.sun_family = AF_UNIX};
+int len;
 
 DEBUG(D_any) debug_printf("creating notifier socket\n");
 
@@ -991,15 +992,17 @@ where = US"socket";
 if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0)
   goto bad;
 #else
-if ((fd = socket(AF_UNIX, SOCK_DGRAM, 0))) < 0)
+if ((fd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0)
   goto bad;
 (void)fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
 #endif
 
-snprintf(sun.sun_path, sizeof(sun.sun_path), "%s/%s",
-  spool_directory, NOTIFIER_SOCKET_NAME);
+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);
+
 where = US"bind";
-if (bind(fd, (const struct sockaddr *)&sun, sizeof(sun)) < 0)
+if (bind(fd, (const struct sockaddr *)&sun, len) < 0)
   goto bad;
 
 where = US"SO_PASSCRED";
@@ -1023,9 +1026,10 @@ static BOOL
 daemon_notification(void)
 {
 uschar buf[256], cbuf[256];
+struct sockaddr_un sun;
 struct iovec iov = {.iov_base = buf, .iov_len = sizeof(buf)-1};
-struct msghdr msg = { .msg_name = NULL,
-		      .msg_namelen = 0,
+struct msghdr msg = { .msg_name = &sun,
+		      .msg_namelen = sizeof(sun),
 		      .msg_iov = &iov,
 		      .msg_iovlen = 1,
 		      .msg_control = cbuf,
@@ -1038,17 +1042,41 @@ buf[sizeof(buf)-1] = 0;
 if ((sz = recvmsg(daemon_notifier_fd, &msg, 0)) <= 0) return FALSE;
 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));
+
+/* Refuse to handle the item unless the peer has good credentials */
+#ifdef SCM_CREDENTIALS
+# define EXIM_SCM_CR_TYPE SCM_CREDENTIALS
+#elif defined(SCM_CREDS)
+# define EXIM_SCM_CR_TYPE SCM_CREDS
+#else
+# error no SCM creds knowlege
+#endif
+
 for (struct cmsghdr * cp = CMSG_FIRSTHDR(&msg);
      cp;
      cp = CMSG_NXTHDR(&msg, cp))
-  if (cp->cmsg_level == SOL_SOCKET && cp->cmsg_type == SCM_CREDENTIALS)
+  if (cp->cmsg_level == SOL_SOCKET && cp->cmsg_type == EXIM_SCM_CR_TYPE)
   {
+#ifdef SCM_CREDENTIALS
   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(SCM_CREDS)
+  struct cmsgcred * cr = (struct cmsgcred *) CMSG_DATA(cp);
+  if (cr->cmcred_uid && cr->cmcred_uid != exim_uid)
+    {
+    DEBUG(D_queue_run) debug_printf("%s: sender creds pid %d uid %d gid %d\n",
+      __FUNCTION__, (int)cr->cmcred_pid, (int)cr->cmcred_uid, (int)cr->cmcred_gid);
+    return FALSE;
+#endif
     }
   break;
   }
@@ -1064,6 +1092,21 @@ switch (buf[0])
     memcpy(queuerun_msgid, buf+1, MESSAGE_ID_LENGTH+1);
     return TRUE;
 #endif	/*EXPERIMENTAL_QUEUE_RAMP*/
+
+  case NOTIFY_QUEUE_SIZE_REQ:
+    {
+    uschar buf[16];
+    int len = snprintf(CS buf, sizeof(buf), "%u", queue_count_cached());
+
+    DEBUG(D_queue_run)
+      debug_printf("%s: queue size request: %s\n", __FUNCTION__, buf);
+
+    if (sendto(daemon_notifier_fd, buf, len, 0,
+		(const struct sockaddr *)&sun, msg.msg_namelen) < 0)
+      log_write(0, LOG_MAIN|LOG_PANIC,
+	"%s: sendto: %s\n", __FUNCTION__, strerror(errno));
+    return FALSE;
+    }
   }
 return FALSE;
 }