Merge commit 'refs/merge-requests/3' of git://gitorious.org/dma/dma

[people/ms/dma.git] / local.c

diff --git a/local.c b/local.c
index bb5c1dfbda7357ab198b4bc32b75e98f6b2f571d..694dd845766a02827fdecf7ac1e9c21863d1c0e3 100644 (file)
--- a/local.c
+++ b/local.c
@@ -1,7 +1,46 @@
+/*
+ * Copyright (c) 2008 The DragonFly Project.  All rights reserved.
+ *
+ * This code is derived from software contributed to The DragonFly Project
+ * by Simon 'corecode' Schubert <corecode@fs.ei.tum.de>.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of The DragonFly Project nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific, prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <sys/wait.h>
+
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <paths.h>
+#include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <syslog.h>
@@ -9,6 +48,79 @@
 
 #include "dma.h"
 
+static int
+create_mbox(const char *name)
+{
+       struct sigaction sa, osa;
+       pid_t child, waitchild;
+       int status;
+       int i;
+       long maxfd;
+       int e;
+       int r = -1;
+
+       /*
+        * We need to enable SIGCHLD temporarily so that waitpid works.
+        */
+       bzero(&sa, sizeof(sa));
+       sa.sa_handler = SIG_DFL;
+       sigaction(SIGCHLD, &sa, &osa);
+
+       do_timeout(100, 0);
+
+       child = fork();
+       switch (child) {
+       case 0:
+               /* child */
+               maxfd = sysconf(_SC_OPEN_MAX);
+               if (maxfd == -1)
+                       maxfd = 1024;   /* what can we do... */
+
+               for (i = 3; i <= maxfd; ++i)
+                       close(i);
+
+               execl(LIBEXEC_PATH "/dma-mbox-create", "dma-mbox-create", name, NULL);
+               syslog(LOG_ERR, "cannot execute "LIBEXEC_PATH"/dma-mbox-create: %m");
+               exit(1);
+
+       default:
+               /* parent */
+               waitchild = waitpid(child, &status, 0);
+
+               e = errno;
+
+               do_timeout(0, 0);
+
+               if (waitchild == -1 && e == EINTR) {
+                       syslog(LOG_ERR, "hung child while creating mbox `%s': %m", name);
+                       break;
+               }
+
+               if (waitchild == -1) {
+                       syslog(LOG_ERR, "child disappeared while creating mbox `%s': %m", name);
+                       break;
+               }
+
+               if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+                       syslog(LOG_ERR, "error creating mbox `%s'", name);
+                       break;
+               }
+
+               /* success */
+               r = 0;
+               break;
+
+       case -1:
+               /* error */
+               syslog(LOG_ERR, "error creating mbox");
+               break;
+       }
+
+       sigaction(SIGCHLD, &osa, NULL);
+
+       return (r);
+}
+
 int
 deliver_local(struct qitem *it)
 {
@@ -17,6 +129,7 @@ deliver_local(struct qitem *it)
        const char *sender;
        const char *newline = "\n";
        size_t linelen;
+       int tries = 0;
        int mbox;
        int error;
        int hadnl = 0;
@@ -29,19 +142,39 @@ deliver_local(struct qitem *it)
                return (1);
        }
 
+retry:
        /* wait for a maximum of 100s to get the lock to the file */
        do_timeout(100, 0);
 
-       /* mailx removes users mailspool file if empty, so open with O_CREAT */
-       mbox = open_locked(fn, O_WRONLY|O_APPEND|O_CREAT, 0660);
+       /* don't use O_CREAT here, because we might be running as the wrong user. */
+       mbox = open_locked(fn, O_WRONLY|O_APPEND);
        if (mbox < 0) {
                int e = errno;
 
                do_timeout(0, 0);
-               if (e == EINTR)
+
+               switch (e) {
+               case EACCES:
+               case ENOENT:
+                       /*
+                        * The file does not exist or we can't access it.
+                        * Call dma-mbox-create to create it and fix permissions.
+                        */
+                       if (tries > 0 || create_mbox(it->addr) != 0) {
+                               syslog(LOG_ERR, "local delivery deferred: can not create `%s'", fn);
+                               return (1);
+                       }
+                       ++tries;
+                       goto retry;
+
+               case EINTR:
                        syslog(LOG_NOTICE, "local delivery deferred: can not lock `%s'", fn);
-               else
+                       break;
+
+               default:
                        syslog(LOG_NOTICE, "local delivery deferred: can not open `%s': %m", fn);
+                       break;
+               }
                return (1);
        }
        do_timeout(0, 0);