#include <unistd.h>
#include <string.h>
#include <signal.h>
+#include <sys/socket.h>
+#include <sys/un.h>
#include "execute.h"
#include "strv.h"
return 0;
}
+static int flags_fds(int fds[], unsigned n_fds) {
+ unsigned i;
+
+ if (n_fds <= 0)
+ return 0;
+
+ assert(fds);
+
+ /* Drops O_NONBLOCK and FD_CLOEXEC from the file flags */
+
+ for (i = 0; i < n_fds; i++) {
+ int flags;
+
+ if ((flags = fcntl(fds[i], F_GETFL, 0)) < 0)
+ return -errno;
+
+ /* Since we are at it, let's make sure that nobody
+ * forgot setting O_NONBLOCK for all our fds */
+
+ if (fcntl(fds[i], F_SETFL, flags &~O_NONBLOCK) < 0)
+ return -errno;
+
+ if ((flags = fcntl(fds[i], F_GETFD, 0)) < 0)
+ return -errno;
+
+ /* Also make sure nobody forgot O_CLOEXEC for all our
+ * fds */
+ if (fcntl(fds[i], F_SETFD, flags &~FD_CLOEXEC) < 0)
+ return -errno;
+ }
+
+ return 0;
+}
+
+static int replace_null_fd(int fd, int flags) {
+ int nfd;
+ assert(fd >= 0);
+
+ close_nointr(fd);
+
+ if ((nfd = open("/dev/null", flags|O_NOCTTY)) < 0)
+ return -errno;
+
+ if (nfd != fd) {
+ close_nointr_nofail(nfd);
+ return -EIO;
+ }
+
+ return 0;
+}
+
+static int setup_output(const ExecContext *context, const char *ident) {
+ int r;
+
+ assert(context);
+
+ switch (context->output) {
+
+ case EXEC_CONSOLE:
+ return 0;
+
+ case EXEC_NULL:
+
+ if ((r = replace_null_fd(STDIN_FILENO, O_RDONLY)) < 0 ||
+ (r = replace_null_fd(STDOUT_FILENO, O_WRONLY)) < 0 ||
+ (r = replace_null_fd(STDERR_FILENO, O_WRONLY)) < 0)
+ return r;
+
+ return 0;
+
+ case EXEC_KERNEL:
+ case EXEC_SYSLOG: {
+
+ int fd;
+ union {
+ struct sockaddr sa;
+ struct sockaddr_un un;
+ } sa;
+
+ if ((r = replace_null_fd(STDIN_FILENO, O_RDONLY)) < 0)
+ return r;
+
+ close_nointr(STDOUT_FILENO);
+ close_nointr(STDERR_FILENO);
+
+ if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
+ return -errno;
+
+ if (fd != STDOUT_FILENO) {
+ close_nointr_nofail(fd);
+ return -EIO;
+ }
+
+ zero(sa);
+ sa.sa.sa_family = AF_UNIX;
+ strncpy(sa.un.sun_path+1, LOGGER_SOCKET, sizeof(sa.un.sun_path)-1);
+
+ if (connect(fd, &sa.sa, sizeof(sa)) < 0) {
+ close_nointr_nofail(fd);
+ return -errno;
+ }
+
+ if (shutdown(fd, SHUT_RD) < 0) {
+ close_nointr_nofail(fd);
+ return -errno;
+ }
+
+ if ((fd = dup(fd)) < 0) {
+ close_nointr_nofail(fd);
+ return -errno;
+ }
+
+ if (fd != STDERR_FILENO) {
+ close_nointr_nofail(fd);
+ return -EIO;
+ }
+
+ /* We speak a very simple protocol between log server
+ * and client: one line for the log destination (kmsg
+ * or syslog), followed by the priority field,
+ * followed by the process name. Since we replaced
+ * stdin/stderr we simple use stdio to write to
+ * it. Note that we use stderr, to minimize buffer
+ * flushing issues. */
+
+ fprintf(stderr,
+ "%s\n"
+ "%i\n"
+ "%s\n",
+ context->output == EXEC_KERNEL ? "kmsg" : "syslog",
+ context->syslog_priority,
+ context->syslog_identifier ? context->syslog_identifier : ident);
+
+ return 0;
+ }
+ }
+
+ assert_not_reached("Unknown logging type");
+}
+
int exec_spawn(const ExecCommand *command, const ExecContext *context, int *fds, unsigned n_fds, pid_t *ret) {
pid_t pid;
if (pid == 0) {
char **e, **f = NULL;
int i, r;
- char t[16];
sigset_t ss;
/* child */
goto fail;
}
- snprintf(t, sizeof(t), "%i", context->oom_adjust);
- char_array_0(t);
-
- if (write_one_line_file("/proc/self/oom_adj", t) < 0) {
- r = EXIT_OOM_ADJUST;
+ if (setup_output(context, file_name_from_path(command->path)) < 0) {
+ r = EXIT_OUTPUT;
goto fail;
}
- if (setpriority(PRIO_PROCESS, 0, context->nice) < 0) {
- r = EXIT_NICE;
- goto fail;
+ if (context->oom_adjust_set) {
+ char t[16];
+
+ snprintf(t, sizeof(t), "%i", context->oom_adjust);
+ char_array_0(t);
+
+ if (write_one_line_file("/proc/self/oom_adj", t) < 0) {
+ r = EXIT_OOM_ADJUST;
+ goto fail;
+ }
}
+ if (context->nice_set)
+ if (setpriority(PRIO_PROCESS, 0, context->nice) < 0) {
+ r = EXIT_NICE;
+ goto fail;
+ }
+
if (close_fds(fds, n_fds) < 0 ||
- shift_fds(fds, n_fds) < 0) {
+ shift_fds(fds, n_fds) < 0 ||
+ flags_fds(fds, n_fds) < 0) {
r = EXIT_FDS;
goto fail;
}
cap_clear(c->capabilities);
c->oom_adjust = 0;
c->nice = 0;
+
+ c->output = 0;
+ c->syslog_priority = LOG_DAEMON|LOG_INFO;
}
void exec_context_done(ExecContext *c) {
free(c->directory);
c->directory = NULL;
+ free(c->syslog_identifier);
+ c->syslog_identifier = NULL;
+
free(c->user);
c->user = NULL;
fprintf(f,
"%sUmask: %04o\n"
- "%sDirectory: %s\n"
- "%sNice: %i\n"
- "%sOOMAdjust: %i\n",
+ "%sDirectory: %s\n",
prefix, c->umask,
- prefix, c->directory ? c->directory : "/",
- prefix, c->nice,
- prefix, c->oom_adjust);
+ prefix, c->directory ? c->directory : "/");
+
+ if (c->nice_set)
+ fprintf(f,
+ "%sNice: %i\n",
+ prefix, c->nice);
+
+ if (c->oom_adjust_set)
+ fprintf(f,
+ "%sOOMAdjust: %i\n",
+ prefix, c->oom_adjust);
}
void exec_status_fill(ExecStatus *s, pid_t pid, int code, int status) {