X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fservice.c;h=e1dab70f816eb2a9ccb8b67e4ad0e2455c1d8440;hp=a38c88076eeb46ded4fa938eec309141b26b15c2;hb=4eab639f92c0e4fa1a1baee5575bf3bc21810dcf;hpb=18c78fb1af5415bb6f87d9c7cae1f9c60e14ae24 diff --git a/src/service.c b/src/service.c index a38c88076..e1dab70f8 100644 --- a/src/service.c +++ b/src/service.c @@ -32,6 +32,7 @@ #include "strv.h" #include "unit-name.h" #include "dbus-service.h" +#include "special.h" #define COMMENTS "#;\n" #define NEWLINES "\n\r" @@ -49,13 +50,13 @@ static const struct { const RunlevelType type; } rcnd_table[] = { /* Standard SysV runlevels */ - { "rc0.d", SPECIAL_RUNLEVEL0_TARGET, RUNLEVEL_DOWN }, - { "rc1.d", SPECIAL_RUNLEVEL1_TARGET, RUNLEVEL_UP }, + { "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN }, + { "rc1.d", SPECIAL_RESCUE_TARGET, RUNLEVEL_UP }, { "rc2.d", SPECIAL_RUNLEVEL2_TARGET, RUNLEVEL_UP }, { "rc3.d", SPECIAL_RUNLEVEL3_TARGET, RUNLEVEL_UP }, { "rc4.d", SPECIAL_RUNLEVEL4_TARGET, RUNLEVEL_UP }, { "rc5.d", SPECIAL_RUNLEVEL5_TARGET, RUNLEVEL_UP }, - { "rc6.d", SPECIAL_RUNLEVEL6_TARGET, RUNLEVEL_DOWN }, + { "rc6.d", SPECIAL_REBOOT_TARGET, RUNLEVEL_DOWN }, /* SUSE style boot.d */ { "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, @@ -125,6 +126,27 @@ static void service_unwatch_main_pid(Service *s) { s->main_pid = 0; } +static int service_set_main_pid(Service *s, pid_t pid) { + pid_t ppid; + + assert(s); + + if (pid <= 1) + return -EINVAL; + + if (pid == getpid()) + return -EINVAL; + + if (get_parent_of_pid(pid, &ppid) >= 0 && ppid != getpid()) + log_warning("%s: Supervising process %lu which is not our child. We'll most likely not notice when it exits.", + s->meta.id, (unsigned long) pid); + + s->main_pid = pid; + s->main_pid_known = true; + + return 0; +} + static void service_close_socket_fd(Service *s) { assert(s); @@ -135,6 +157,16 @@ static void service_close_socket_fd(Service *s) { s->socket_fd = -1; } +static void service_connection_unref(Service *s) { + assert(s); + + if (!s->socket) + return; + + socket_connection_unref(s->socket); + s->socket = NULL; +} + static void service_done(Unit *u) { Service *s = SERVICE(u); @@ -168,6 +200,7 @@ static void service_done(Unit *u) { } service_close_socket_fd(s); + service_connection_unref(s); unit_unwatch_timer(u, &s->timer_watch); } @@ -246,7 +279,7 @@ static int sysv_fix_order(Service *s) { /* For each pair of services where at least one lacks a LSB * header, we use the start priority value to order things. */ - LIST_FOREACH(units_per_type, other, UNIT(s)->meta.manager->units_per_type[UNIT_SERVICE]) { + LIST_FOREACH(units_per_type, other, s->meta.manager->units_per_type[UNIT_SERVICE]) { Service *t; UnitDependency d; @@ -678,7 +711,7 @@ static int service_load_sysv_name(Service *s, const char *name) { endswith(name, ".sh.service")) return -ENOENT; - STRV_FOREACH(p, UNIT(s)->meta.manager->lookup_paths.sysvinit_path) { + STRV_FOREACH(p, s->meta.manager->lookup_paths.sysvinit_path) { char *path; int r; @@ -690,7 +723,7 @@ static int service_load_sysv_name(Service *s, const char *name) { r = service_load_sysv_path(s, path); - if (r >= 0 && UNIT(s)->meta.load_state == UNIT_STUB) { + if (r >= 0 && s->meta.load_state == UNIT_STUB) { /* Try Debian style xxx.sh source'able init scripts */ strcat(path, ".sh"); r = service_load_sysv_path(s, path); @@ -698,7 +731,7 @@ static int service_load_sysv_name(Service *s, const char *name) { free(path); - if (r >= 0 && UNIT(s)->meta.load_state == UNIT_STUB) { + if (r >= 0 && s->meta.load_state == UNIT_STUB) { /* Try SUSE style boot.xxx init scripts */ if (asprintf(&path, "%s/boot.%s", *p, name) < 0) @@ -712,7 +745,7 @@ static int service_load_sysv_name(Service *s, const char *name) { if (r < 0) return r; - if ((UNIT(s)->meta.load_state != UNIT_STUB)) + if ((s->meta.load_state != UNIT_STUB)) break; } @@ -729,22 +762,22 @@ static int service_load_sysv(Service *s) { /* Load service data from SysV init scripts, preferably with * LSB headers ... */ - if (strv_isempty(UNIT(s)->meta.manager->lookup_paths.sysvinit_path)) + if (strv_isempty(s->meta.manager->lookup_paths.sysvinit_path)) return 0; - if ((t = UNIT(s)->meta.id)) + if ((t = s->meta.id)) if ((r = service_load_sysv_name(s, t)) < 0) return r; - if (UNIT(s)->meta.load_state == UNIT_STUB) - SET_FOREACH(t, UNIT(s)->meta.names, i) { - if (t == UNIT(s)->meta.id) + if (s->meta.load_state == UNIT_STUB) + SET_FOREACH(t, s->meta.names, i) { + if (t == s->meta.id) continue; if ((r == service_load_sysv_name(s, t)) < 0) return r; - if (UNIT(s)->meta.load_state != UNIT_STUB) + if (s->meta.load_state != UNIT_STUB) break; } @@ -770,16 +803,26 @@ static int service_add_bus_name(Service *s) { static int service_verify(Service *s) { assert(s); - if (UNIT(s)->meta.load_state != UNIT_LOADED) + if (s->meta.load_state != UNIT_LOADED) return 0; if (!s->exec_command[SERVICE_EXEC_START]) { - log_error("%s lacks ExecStart setting. Refusing.", UNIT(s)->meta.id); + log_error("%s lacks ExecStart setting. Refusing.", s->meta.id); + return -EINVAL; + } + + if (s->exec_command[SERVICE_EXEC_START]->command_next) { + log_error("%s has more than one ExecStart setting. Refusing.", s->meta.id); return -EINVAL; } if (s->type == SERVICE_DBUS && !s->bus_name) { - log_error("%s is of type D-Bus but no D-Bus service name has been specified. Refusing.", UNIT(s)->meta.id); + log_error("%s is of type D-Bus but no D-Bus service name has been specified. Refusing.", s->meta.id); + return -EINVAL; + } + + if (s->exec_context.pam_name && s->kill_mode != KILL_CONTROL_GROUP) { + log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", s->meta.id); return -EINVAL; } @@ -828,6 +871,9 @@ static int service_load(Unit *u) { if ((r = unit_watch_bus_name(u, s->bus_name)) < 0) return r; } + + if (s->type == SERVICE_NOTIFY && s->notify_access == NOTIFY_NONE) + s->notify_access = NOTIFY_MAIN; } return service_verify(s); @@ -851,23 +897,25 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { "%sRootDirectoryStartOnly: %s\n" "%sValidNoProcess: %s\n" "%sKillMode: %s\n" - "%sType: %s\n", + "%sType: %s\n" + "%sNotifyAccess: %s\n", prefix, service_state_to_string(s->state), prefix, yes_no(s->permissions_start_only), prefix, yes_no(s->root_directory_start_only), prefix, yes_no(s->valid_no_process), prefix, kill_mode_to_string(s->kill_mode), - prefix, service_type_to_string(s->type)); + prefix, service_type_to_string(s->type), + prefix, notify_access_to_string(s->notify_access)); if (s->control_pid > 0) fprintf(f, - "%sControl PID: %llu\n", - prefix, (unsigned long long) s->control_pid); + "%sControl PID: %lu\n", + prefix, (unsigned long) s->control_pid); if (s->main_pid > 0) fprintf(f, - "%sMain PID: %llu\n", - prefix, (unsigned long long) s->main_pid); + "%sMain PID: %lu\n", + prefix, (unsigned long) s->main_pid); if (s->pid_file) fprintf(f, @@ -919,8 +967,8 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { static int service_load_pid_file(Service *s) { char *k; - unsigned long p; int r; + pid_t pid; assert(s); @@ -935,29 +983,24 @@ static int service_load_pid_file(Service *s) { if ((r = read_one_line_file(s->pid_file, &k)) < 0) return r; - if ((r = safe_atolu(k, &p)) < 0) { - free(k); - return r; - } + r = parse_pid(k, &pid); + free(k); - if ((unsigned long) (pid_t) p != p) - return -ERANGE; - - if (p <= 1) - return -ERANGE; + if (r < 0) + return r; - if (kill((pid_t) p, 0) < 0 && errno != EPERM) { - log_warning("PID %llu read from file %s does not exist. Your service or init script might be broken.", - (unsigned long long) p, s->pid_file); + if (kill(pid, 0) < 0 && errno != EPERM) { + log_warning("PID %lu read from file %s does not exist. Your service or init script might be broken.", + (unsigned long) pid, s->pid_file); return -ESRCH; } - if ((r = unit_watch_pid(UNIT(s), (pid_t) p)) < 0) - /* FIXME: we need to do something here */ + if ((r = service_set_main_pid(s, pid)) < 0) return r; - s->main_pid = (pid_t) p; - s->main_pid_known = true; + if ((r = unit_watch_pid(UNIT(s), pid)) < 0) + /* FIXME: we need to do something here */ + return r; return 0; } @@ -971,6 +1014,9 @@ static int service_get_sockets(Service *s, Set **_set) { assert(s); assert(_set); + if (s->socket_fd >= 0) + return 0; + /* Collects all Socket objects that belong to this * service. Note that a service might have multiple sockets * via multiple names. */ @@ -978,7 +1024,7 @@ static int service_get_sockets(Service *s, Set **_set) { if (!(set = set_new(NULL, NULL))) return -ENOMEM; - SET_FOREACH(t, UNIT(s)->meta.names, i) { + SET_FOREACH(t, s->meta.names, i) { char *k; Unit *p; @@ -990,7 +1036,7 @@ static int service_get_sockets(Service *s, Set **_set) { goto fail; } - p = manager_get_unit(UNIT(s)->meta.manager, k); + p = manager_get_unit(s->meta.manager, k); free(k); if (!p) @@ -1016,6 +1062,9 @@ static int service_notify_sockets_dead(Service *s) { assert(s); + if (s->socket_fd >= 0) + return 0; + /* Notifies all our sockets when we die */ if ((r = service_get_sockets(s, &set)) < 0) return r; @@ -1085,11 +1134,22 @@ static void service_set_state(Service *s, ServiceState state) { if (state != SERVICE_START_PRE && state != SERVICE_START && - !(state == SERVICE_DEAD && UNIT(s)->meta.job)) + state != SERVICE_START_POST && + state != SERVICE_RUNNING && + state != SERVICE_RELOAD && + state != SERVICE_STOP && + state != SERVICE_STOP_SIGTERM && + state != SERVICE_STOP_SIGKILL && + state != SERVICE_STOP_POST && + state != SERVICE_FINAL_SIGTERM && + state != SERVICE_FINAL_SIGKILL && + !(state == SERVICE_DEAD && s->meta.job)) { service_close_socket_fd(s); + service_connection_unref(s); + } if (old_state != state) - log_debug("%s changed %s -> %s", UNIT(s)->meta.id, service_state_to_string(old_state), service_state_to_string(state)); + log_debug("%s changed %s -> %s", s->meta.id, service_state_to_string(old_state), service_state_to_string(state)); unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state]); } @@ -1172,6 +1232,9 @@ static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) { assert(fds); assert(n_fds); + if (s->socket_fd >= 0) + return 0; + if ((r = service_get_sockets(s, &set)) < 0) return r; @@ -1228,24 +1291,33 @@ static int service_spawn( bool pass_fds, bool apply_permissions, bool apply_chroot, + bool set_notify_socket, pid_t *_pid) { pid_t pid; int r; - int *fds = NULL; + int *fds = NULL, *fdsbuf = NULL; unsigned n_fds = 0; - char **argv; + char **argv = NULL, **env = NULL; assert(s); assert(c); assert(_pid); - if (pass_fds) { + if (pass_fds || + s->exec_context.std_input == EXEC_INPUT_SOCKET || + s->exec_context.std_output == EXEC_OUTPUT_SOCKET || + s->exec_context.std_error == EXEC_OUTPUT_SOCKET) { + if (s->socket_fd >= 0) { fds = &s->socket_fd; n_fds = 1; - } else if ((r = service_collect_fds(s, &fds, &n_fds)) < 0) - goto fail; + } else { + if ((r = service_collect_fds(s, &fdsbuf, &n_fds)) < 0) + goto fail; + + fds = fdsbuf; + } } if (timeout && s->timeout_usec) { @@ -1259,27 +1331,47 @@ static int service_spawn( goto fail; } + if (set_notify_socket) { + char *t; + + if (asprintf(&t, "NOTIFY_SOCKET=@%s", s->meta.manager->notify_socket) < 0) { + r = -ENOMEM; + goto fail; + } + + env = strv_env_set(s->meta.manager->environment, t); + free(t); + + if (!env) { + r = -ENOMEM; + goto fail; + } + } else + env = s->meta.manager->environment; + r = exec_spawn(c, argv, &s->exec_context, fds, n_fds, - s->meta.manager->environment, + env, apply_permissions, apply_chroot, - UNIT(s)->meta.manager->confirm_spawn, - UNIT(s)->meta.cgroup_bondings, + s->meta.manager->confirm_spawn, + s->meta.cgroup_bondings, &pid); strv_free(argv); + argv = NULL; + + if (set_notify_socket) + strv_free(env); + env = NULL; + if (r < 0) goto fail; - if (fds) { - if (s->socket_fd >= 0) - service_close_socket_fd(s); - else - free(fds); - } + if (fdsbuf) + free(fdsbuf); if ((r = unit_watch_pid(UNIT(s), pid)) < 0) /* FIXME: we need to do something here */ @@ -1292,6 +1384,11 @@ static int service_spawn( fail: free(fds); + strv_free(argv); + + if (set_notify_socket) + strv_free(env); + if (timeout) unit_unwatch_timer(UNIT(s), &s->timer_watch); @@ -1324,10 +1421,7 @@ static int cgroup_good(Service *s) { assert(s); - if (s->valid_no_process) - return -EAGAIN; - - if ((r = cgroup_bonding_is_empty_list(UNIT(s)->meta.cgroup_bondings)) < 0) + if ((r = cgroup_bonding_is_empty_list(s->meta.cgroup_bondings)) < 0) return r; return !r; @@ -1355,7 +1449,7 @@ static void service_enter_dead(Service *s, bool success, bool allow_restart) { return; fail: - log_warning("%s failed to run install restart timer: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run install restart timer: %s", s->meta.id, strerror(-r)); service_enter_dead(s, false, false); } @@ -1378,6 +1472,7 @@ static void service_enter_stop_post(Service *s, bool success) { false, !s->permissions_start_only, !s->root_directory_start_only, + false, &s->control_pid)) < 0) goto fail; @@ -1389,7 +1484,7 @@ static void service_enter_stop_post(Service *s, bool success) { return; fail: - log_warning("%s failed to run 'stop-post' task: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run 'stop-post' task: %s", s->meta.id, strerror(-r)); service_enter_signal(s, SERVICE_FINAL_SIGTERM, false); } @@ -1407,7 +1502,7 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) { if (s->kill_mode == KILL_CONTROL_GROUP) { - if ((r = cgroup_bonding_kill_list(UNIT(s)->meta.cgroup_bondings, sig)) < 0) { + if ((r = cgroup_bonding_kill_list(s->meta.cgroup_bondings, sig)) < 0) { if (r != -EAGAIN && r != -ESRCH) goto fail; } else @@ -1450,7 +1545,7 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) { return; fail: - log_warning("%s failed to kill processes: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to kill processes: %s", s->meta.id, strerror(-r)); if (state == SERVICE_STOP_SIGTERM || state == SERVICE_STOP_SIGKILL) service_enter_stop_post(s, false); @@ -1460,6 +1555,7 @@ fail: static void service_enter_stop(Service *s, bool success) { int r; + assert(s); if (!success) @@ -1475,6 +1571,7 @@ static void service_enter_stop(Service *s, bool success) { false, !s->permissions_start_only, !s->root_directory_start_only, + false, &s->control_pid)) < 0) goto fail; @@ -1485,18 +1582,21 @@ static void service_enter_stop(Service *s, bool success) { return; fail: - log_warning("%s failed to run 'stop' task: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run 'stop' task: %s", s->meta.id, strerror(-r)); service_enter_signal(s, SERVICE_STOP_SIGTERM, false); } static void service_enter_running(Service *s, bool success) { + int main_pid_ok, cgroup_ok; assert(s); if (!success) s->failure = true; - if (main_pid_good(s) != 0 && - cgroup_good(s) != 0 && + main_pid_ok = main_pid_good(s); + cgroup_ok = cgroup_good(s); + + if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) && (s->bus_name_good || s->type != SERVICE_DBUS)) service_set_state(s, SERVICE_RUNNING); else if (s->valid_no_process) @@ -1519,10 +1619,10 @@ static void service_enter_start_post(Service *s) { false, !s->permissions_start_only, !s->root_directory_start_only, + false, &s->control_pid)) < 0) goto fail; - service_set_state(s, SERVICE_START_POST); } else service_enter_running(s, true); @@ -1530,7 +1630,7 @@ static void service_enter_start_post(Service *s) { return; fail: - log_warning("%s failed to run 'start-post' task: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run 'start-post' task: %s", s->meta.id, strerror(-r)); service_enter_stop(s, false); } @@ -1554,6 +1654,7 @@ static void service_enter_start(Service *s) { true, true, true, + s->notify_access != NOTIFY_NONE, &pid)) < 0) goto fail; @@ -1561,9 +1662,7 @@ static void service_enter_start(Service *s) { /* For simple services we immediately start * the START_POST binaries. */ - s->main_pid = pid; - s->main_pid_known = true; - + service_set_main_pid(s, pid); service_enter_start_post(s); } else if (s->type == SERVICE_FORKING) { @@ -1571,10 +1670,10 @@ static void service_enter_start(Service *s) { /* For forking services we wait until the start * process exited. */ - s->control_pid = pid; - s->control_command_id = SERVICE_EXEC_START; s->control_command = s->exec_command[SERVICE_EXEC_START]; + + s->control_pid = pid; service_set_state(s, SERVICE_START); } else if (s->type == SERVICE_FINISH || @@ -1588,9 +1687,7 @@ static void service_enter_start(Service *s) { * but wait for the bus name to appear on the * bus. Notify services are similar. */ - s->main_pid = pid; - s->main_pid_known = true; - + service_set_main_pid(s, pid); service_set_state(s, SERVICE_START); } else assert_not_reached("Unknown service type"); @@ -1598,7 +1695,7 @@ static void service_enter_start(Service *s) { return; fail: - log_warning("%s failed to run 'start' task: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run 'start' task: %s", s->meta.id, strerror(-r)); service_enter_signal(s, SERVICE_FINAL_SIGTERM, false); } @@ -1617,6 +1714,7 @@ static void service_enter_start_pre(Service *s) { false, !s->permissions_start_only, !s->root_directory_start_only, + false, &s->control_pid)) < 0) goto fail; @@ -1627,7 +1725,7 @@ static void service_enter_start_pre(Service *s) { return; fail: - log_warning("%s failed to run 'start-pre' task: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run 'start-pre' task: %s", s->meta.id, strerror(-r)); service_enter_dead(s, false, true); } @@ -1637,15 +1735,15 @@ static void service_enter_restart(Service *s) { service_enter_dead(s, true, false); - if ((r = manager_add_job(UNIT(s)->meta.manager, JOB_START, UNIT(s), JOB_FAIL, false, NULL)) < 0) + if ((r = manager_add_job(s->meta.manager, JOB_START, UNIT(s), JOB_FAIL, false, NULL)) < 0) goto fail; - log_debug("%s scheduled restart job.", UNIT(s)->meta.id); + log_debug("%s scheduled restart job.", s->meta.id); return; fail: - log_warning("%s failed to schedule restart job: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to schedule restart job: %s", s->meta.id, strerror(-r)); service_enter_dead(s, false, false); } @@ -1664,6 +1762,7 @@ static void service_enter_reload(Service *s) { false, !s->permissions_start_only, !s->root_directory_start_only, + false, &s->control_pid)) < 0) goto fail; @@ -1674,7 +1773,7 @@ static void service_enter_reload(Service *s) { return; fail: - log_warning("%s failed to run 'reload' task: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run 'reload' task: %s", s->meta.id, strerror(-r)); service_enter_stop(s, false); } @@ -1698,13 +1797,14 @@ static void service_run_next(Service *s, bool success) { false, !s->permissions_start_only, !s->root_directory_start_only, + false, &s->control_pid)) < 0) goto fail; return; fail: - log_warning("%s failed to run spawn next task: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run next task: %s", s->meta.id, strerror(-r)); if (s->state == SERVICE_START_PRE) service_enter_signal(s, SERVICE_FINAL_SIGTERM, false); @@ -1819,10 +1919,10 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) { unit_serialize_item(u, f, "failure", yes_no(s->failure)); if (s->control_pid > 0) - unit_serialize_item_format(u, f, "control-pid", "%u", (unsigned) (s->control_pid)); + unit_serialize_item_format(u, f, "control-pid", "%lu", (unsigned long) s->control_pid); - if (s->main_pid > 0) - unit_serialize_item_format(u, f, "main-pid", "%u", (unsigned) (s->main_pid)); + if (s->main_pid_known && s->main_pid > 0) + unit_serialize_item_format(u, f, "main-pid", "%lu", (unsigned long) s->main_pid); unit_serialize_item(u, f, "main-pid-known", yes_no(s->main_pid_known)); @@ -1868,19 +1968,19 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value, else s->failure = b || s->failure; } else if (streq(key, "control-pid")) { - unsigned pid; + pid_t pid; - if ((r = safe_atou(value, &pid)) < 0 || pid <= 0) + if ((r = parse_pid(value, &pid)) < 0) log_debug("Failed to parse control-pid value %s", value); else - s->control_pid = (pid_t) pid; + s->control_pid = pid; } else if (streq(key, "main-pid")) { - unsigned pid; + pid_t pid; - if ((r = safe_atou(value, &pid)) < 0 || pid <= 0) + if ((r = parse_pid(value, &pid)) < 0) log_debug("Failed to parse main-pid value %s", value); else - s->main_pid = (pid_t) pid; + service_set_main_pid(s, (pid_t) pid); } else if (streq(key, "main-pid-known")) { int b; @@ -2075,7 +2175,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { * executed. */ if ((r = service_load_pid_file(s)) < 0) - log_warning("%s: failed to load PID file %s: %s", UNIT(s)->meta.id, s->pid_file, strerror(-r)); + log_warning("%s: failed to load PID file %s: %s", s->meta.id, s->pid_file, strerror(-r)); } /* Fall through */ @@ -2205,12 +2305,24 @@ static void service_cgroup_notify_event(Unit *u) { } } -static void service_notify_message(Unit *u, char **tags) { +static void service_notify_message(Unit *u, pid_t pid, char **tags) { Service *s = SERVICE(u); const char *e; assert(u); + if (s->notify_access == NOTIFY_NONE) { + log_warning("%s: Got notification message from PID %lu, but reception is disabled.", + u->meta.id, (unsigned long) pid); + return; + } + + if (s->notify_access == NOTIFY_MAIN && pid != s->main_pid) { + log_warning("%s: Got notification message from PID %lu, but reception only permitted for PID %lu", + u->meta.id, (unsigned long) pid, (unsigned long) s->main_pid); + return; + } + log_debug("%s: Got message", u->meta.id); /* Interpret MAINPID= */ @@ -2219,15 +2331,12 @@ static void service_notify_message(Unit *u, char **tags) { s->state == SERVICE_START_POST || s->state == SERVICE_RUNNING || s->state == SERVICE_RELOAD)) { - unsigned long pid; - if (safe_atolu(e + 8, &pid) < 0 || - (unsigned long) (pid_t) pid != pid || - pid <= 1) + if (parse_pid(e + 8, &pid) < 0) log_warning("Failed to parse %s", e); else { log_debug("%s: got %s", u->meta.id, e); - s->main_pid = (pid_t) pid; + service_set_main_pid(s, pid); } } @@ -2460,10 +2569,10 @@ static void service_bus_query_pid_done( s->state == SERVICE_START_POST || s->state == SERVICE_RUNNING || s->state == SERVICE_RELOAD)) - s->main_pid = pid; + service_set_main_pid(s, pid); } -int service_set_socket_fd(Service *s, int fd) { +int service_set_socket_fd(Service *s, int fd, Socket *sock) { assert(s); assert(fd >= 0); @@ -2471,7 +2580,7 @@ int service_set_socket_fd(Service *s, int fd) { * service for a stream socket and the socket needs to be * configured. */ - if (UNIT(s)->meta.load_state != UNIT_LOADED) + if (s->meta.load_state != UNIT_LOADED) return -EINVAL; if (s->socket_fd >= 0) @@ -2482,6 +2591,8 @@ int service_set_socket_fd(Service *s, int fd) { s->socket_fd = fd; s->got_socket_fd = true; + s->socket = sock; + return 0; } @@ -2534,6 +2645,14 @@ static const char* const service_exec_command_table[_SERVICE_EXEC_COMMAND_MAX] = DEFINE_STRING_TABLE_LOOKUP(service_exec_command, ServiceExecCommand); +static const char* const notify_access_table[_NOTIFY_ACCESS_MAX] = { + [NOTIFY_NONE] = "none", + [NOTIFY_MAIN] = "main", + [NOTIFY_ALL] = "all" +}; + +DEFINE_STRING_TABLE_LOOKUP(notify_access, NotifyAccess); + const UnitVTable service_vtable = { .suffix = ".service",