X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=load-fragment.c;h=94bdf171af56782cfae35bedade867142807942a;hp=7877a8c4af333052264d6e5a7b1619090d4704c4;hb=b08d03ffe58332f590aae5c78a85e4fc0b8588ce;hpb=87f0e418cf2c58b3201d06a60e3696ec672d2662 diff --git a/load-fragment.c b/load-fragment.c index 7877a8c4a..94bdf171a 100644 --- a/load-fragment.c +++ b/load-fragment.c @@ -35,19 +35,15 @@ static int config_parse_deps( FOREACH_WORD(w, &l, rvalue, state) { char *t; int r; - Unit *other; if (!(t = strndup(w, l))) return -ENOMEM; - r = manager_load_unit(u->meta.manager, t, &other); + r = unit_add_dependency_by_name(u, d, t); free(t); if (r < 0) return r; - - if ((r = unit_add_dependency(u, d, other)) < 0) - return r; } return 0; @@ -208,7 +204,8 @@ static int config_parse_nice( void *data, void *userdata) { - int *i = data, priority, r; + ExecContext *c = data; + int priority, r; assert(filename); assert(lvalue); @@ -225,7 +222,9 @@ static int config_parse_nice( return -ERANGE; } - *i = priority; + c->nice = priority; + c->nice_set = false; + return 0; } @@ -238,7 +237,8 @@ static int config_parse_oom_adjust( void *data, void *userdata) { - int *i = data, oa, r; + ExecContext *c = data; + int oa, r; assert(filename); assert(lvalue); @@ -255,7 +255,9 @@ static int config_parse_oom_adjust( return -ERANGE; } - *i = oa; + c->oom_adjust = oa; + c->oom_adjust_set = true; + return 0; } @@ -328,7 +330,7 @@ static int config_parse_exec( n[k] = NULL; - if (!n[0] || n[0][0] != '/') { + if (!n[0] || !path_is_absolute(n[0])) { log_error("[%s:%u] Invalid executable path in command line: %s", filename, line, rvalue); strv_free(n); return -EINVAL; @@ -450,117 +452,250 @@ static int config_parse_service_restart( return 0; } -#define FOLLOW_MAX 8 +int config_parse_bindtodevice( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { -static char *build_path(const char *path, const char *filename) { - char *e, *r; - size_t k; + Socket *s = data; + char *n; - assert(path); assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + if (rvalue[0] && !streq(rvalue, "*")) { + if (!(n = strdup(rvalue))) + return -ENOMEM; + } else + n = NULL; + + free(s->bind_to_device); + s->bind_to_device = n; - /* This removes the last component of path and appends - * filename, unless the latter is absolute anyway or the - * former isn't */ + return 0; +} + +int config_parse_output( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { - if (filename[0] == '/') - return strdup(filename); + ExecOutput *o = data; - if (!(e = strrchr(path, '/'))) - return strdup(filename); + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); - k = strlen(filename); - if (!(r = new(char, e-path+1+k+1))) - return NULL; + if (streq(rvalue, "syslog")) + *o = EXEC_SYSLOG; + else if (streq(rvalue, "null")) + *o = EXEC_NULL; + else if (streq(rvalue, "syslog")) + *o = EXEC_SYSLOG; + else if (streq(rvalue, "kernel")) + *o = EXEC_KERNEL; + else { + log_error("[%s:%u] Failed to parse log output: %s", filename, line, rvalue); + return -EBADMSG; + } - memcpy(r, path, e-path+1); - memcpy(r+(e-path)+1, filename, k+1); + return 0; +} - return r; +int config_parse_facility( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { + + static const char * const table[LOG_NFACILITIES] = { + [LOG_FAC(LOG_KERN)] = "kern", + [LOG_FAC(LOG_USER)] = "user", + [LOG_FAC(LOG_MAIL)] = "mail", + [LOG_FAC(LOG_DAEMON)] = "daemon", + [LOG_FAC(LOG_AUTH)] = "auth", + [LOG_FAC(LOG_SYSLOG)] = "syslog", + [LOG_FAC(LOG_LPR)] = "lpr", + [LOG_FAC(LOG_NEWS)] = "news", + [LOG_FAC(LOG_UUCP)] = "uucp", + [LOG_FAC(LOG_CRON)] = "cron", + [LOG_FAC(LOG_AUTHPRIV)] = "authpriv", + [LOG_FAC(LOG_FTP)] = "ftp", + [LOG_FAC(LOG_LOCAL0)] = "local0", + [LOG_FAC(LOG_LOCAL1)] = "local1", + [LOG_FAC(LOG_LOCAL2)] = "local2", + [LOG_FAC(LOG_LOCAL3)] = "local3", + [LOG_FAC(LOG_LOCAL4)] = "local4", + [LOG_FAC(LOG_LOCAL5)] = "local5", + [LOG_FAC(LOG_LOCAL6)] = "local6", + [LOG_FAC(LOG_LOCAL7)] = "local7" + }; + + ExecOutput *o = data; + int i; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + for (i = 0; i < (int) ELEMENTSOF(table); i++) + if (streq(rvalue, table[i])) { + *o = LOG_MAKEPRI(i, LOG_PRI(*o)); + break; + } + + if (i >= (int) ELEMENTSOF(table)) { + + /* Second try, let's see if this is a number. */ + if (safe_atoi(rvalue, &i) >= 0 && + i >= 0 && + i < (int) ELEMENTSOF(table)) + *o = LOG_MAKEPRI(i, LOG_PRI(*o)); + else { + log_error("[%s:%u] Failed to parse log output: %s", filename, line, rvalue); + return -EBADMSG; + } + } + + return 0; +} + +int config_parse_level( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { + + static const char * const table[LOG_DEBUG+1] = { + [LOG_EMERG] = "emerg", + [LOG_ALERT] = "alert", + [LOG_CRIT] = "crit", + [LOG_ERR] = "err", + [LOG_WARNING] = "warning", + [LOG_NOTICE] = "notice", + [LOG_INFO] = "info", + [LOG_DEBUG] = "debug" + }; + + ExecOutput *o = data; + int i; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + for (i = 0; i < (int) ELEMENTSOF(table); i++) + if (streq(rvalue, table[i])) { + *o = LOG_MAKEPRI(LOG_FAC(*o), i); + break; + } + + if (i >= LOG_NFACILITIES) { + + /* Second try, let's see if this is a number. */ + if (safe_atoi(rvalue, &i) >= 0 && + i >= 0 && + i < (int) ELEMENTSOF(table)) + *o = LOG_MAKEPRI(LOG_FAC(*o), i); + else { + log_error("[%s:%u] Failed to parse log output: %s", filename, line, rvalue); + return -EBADMSG; + } + } + + return 0; } -static int open_follow(const char **filename, FILE **_f, Set *names) { - unsigned c; +#define FOLLOW_MAX 8 + +static int open_follow(char **filename, FILE **_f, Set *names, char **_id) { + unsigned c = 0; int fd, r; FILE *f; - char *n = NULL; - const char *fn; + char *id = NULL; assert(filename); assert(*filename); assert(_f); assert(names); - fn = *filename; + /* This will update the filename pointer if the loaded file is + * reached by a symlink. The old string will be freed. */ - for (c = 0; c < FOLLOW_MAX; c++) { + for (;;) { char *target, *k, *name; + if (c++ >= FOLLOW_MAX) + return -ELOOP; + + path_kill_slashes(*filename); + /* Add the file name we are currently looking at to * the names of this unit */ - name = file_name_from_path(fn); - if (!set_get(names, name)) { + name = file_name_from_path(*filename); + if (!(id = set_get(names, name))) { - if (!(name = strdup(name))) { - r = -ENOMEM; - goto finish; - } + if (!(id = strdup(name))) + return -ENOMEM; - if ((r = set_put(names, name)) < 0) { - free(name); - goto finish; + if ((r = set_put(names, id)) < 0) { + free(id); + return r; } - - free(name); } - /* Try to open the file name, but don' if its a symlink */ - fd = open(fn, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW); - if (fd >= 0 || errno != ELOOP) + /* Try to open the file name, but don't if its a symlink */ + if ((fd = open(*filename, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW)) >= 0) break; + if (errno != ELOOP) + return -errno; + /* Hmm, so this is a symlink. Let's read the name, and follow it manually */ - if ((r = readlink_malloc(fn, &target)) < 0) - goto finish; + if ((r = readlink_malloc(*filename, &target)) < 0) + return r; - k = build_path(fn, target); + k = file_in_same_dir(*filename, target); free(target); - if (!k) { - r = -ENOMEM; - goto finish; - } - - free(n); - fn = n = k; - } - - if (c >= FOLLOW_MAX) { - r = -ELOOP; - goto finish; - } + if (!k) + return -ENOMEM; - if (fd < 0) { - r = -errno; - goto finish; + free(*filename); + *filename = k; } if (!(f = fdopen(fd, "r"))) { r = -errno; assert(close_nointr(fd) == 0); - goto finish; + return r; } *_f = f; - *filename = fn; - r = 0; - -finish: - free(n); - return r; + *_id = id; + return 0; } -int unit_load_fragment(Unit *u) { +static int load_from_path(Unit *u, const char *path) { static const char* const section_table[_UNIT_TYPE_MAX] = { [UNIT_SERVICE] = "Service", @@ -574,50 +709,55 @@ int unit_load_fragment(Unit *u) { }; #define EXEC_CONTEXT_CONFIG_ITEMS(context, section) \ - { "Directory", config_parse_path, &(context).directory, section }, \ - { "User", config_parse_string, &(context).user, section }, \ - { "Group", config_parse_string, &(context).group, section }, \ - { "SupplementaryGroups", config_parse_strv, &(context).supplementary_groups, section }, \ - { "Nice", config_parse_nice, &(context).nice, section }, \ - { "OOMAdjust", config_parse_oom_adjust, &(context).oom_adjust, section }, \ - { "UMask", config_parse_umask, &(context).umask, section }, \ - { "Environment", config_parse_strv, &(context).environment, section } + { "Directory", config_parse_path, &(context).directory, section }, \ + { "User", config_parse_string, &(context).user, section }, \ + { "Group", config_parse_string, &(context).group, section }, \ + { "SupplementaryGroups", config_parse_strv, &(context).supplementary_groups, section }, \ + { "Nice", config_parse_nice, &(context), section }, \ + { "OOMAdjust", config_parse_oom_adjust, &(context), section }, \ + { "UMask", config_parse_umask, &(context).umask, section }, \ + { "Environment", config_parse_strv, &(context).environment, section }, \ + { "Output", config_parse_output, &(context).output, section }, \ + { "SyslogIdentifier", config_parse_string, &(context).syslog_identifier, section }, \ + { "SyslogFacility", config_parse_facility, &(context).syslog_priority, section }, \ + { "SyslogLevel", config_parse_level, &(context).syslog_priority, section } const ConfigItem items[] = { - { "Names", config_parse_names, u, "Meta" }, - { "Description", config_parse_string, &u->meta.description, "Meta" }, - { "Requires", config_parse_deps, UINT_TO_PTR(UNIT_REQUIRES), "Meta" }, - { "SoftRequires", config_parse_deps, UINT_TO_PTR(UNIT_SOFT_REQUIRES), "Meta" }, - { "Wants", config_parse_deps, UINT_TO_PTR(UNIT_WANTS), "Meta" }, - { "Requisite", config_parse_deps, UINT_TO_PTR(UNIT_REQUISITE), "Meta" }, - { "SoftRequisite", config_parse_deps, UINT_TO_PTR(UNIT_SOFT_REQUISITE), "Meta" }, - { "Conflicts", config_parse_deps, UINT_TO_PTR(UNIT_CONFLICTS), "Meta" }, - { "Before", config_parse_deps, UINT_TO_PTR(UNIT_BEFORE), "Meta" }, - { "After", config_parse_deps, UINT_TO_PTR(UNIT_AFTER), "Meta" }, - - { "PIDFile", config_parse_path, &u->service.pid_file, "Service" }, - { "ExecStartPre", config_parse_exec, &u->service.exec_command[SERVICE_EXEC_START_PRE], "Service" }, - { "ExecStart", config_parse_exec, &u->service.exec_command[SERVICE_EXEC_START], "Service" }, - { "ExecStartPost", config_parse_exec, &u->service.exec_command[SERVICE_EXEC_START_POST], "Service" }, - { "ExecReload", config_parse_exec, &u->service.exec_command[SERVICE_EXEC_RELOAD], "Service" }, - { "ExecStop", config_parse_exec, &u->service.exec_command[SERVICE_EXEC_STOP], "Service" }, - { "ExecStopPost", config_parse_exec, &u->service.exec_command[SERVICE_EXEC_STOP_POST], "Service" }, - { "RestartSec", config_parse_usec, &u->service.restart_usec, "Service" }, - { "TimeoutSec", config_parse_usec, &u->service.timeout_usec, "Service" }, - { "Type", config_parse_service_type, &u->service, "Service" }, - { "Restart", config_parse_service_restart, &u->service, "Service" }, + { "Names", config_parse_names, u, "Meta" }, + { "Description", config_parse_string, &u->meta.description, "Meta" }, + { "Requires", config_parse_deps, UINT_TO_PTR(UNIT_REQUIRES), "Meta" }, + { "SoftRequires", config_parse_deps, UINT_TO_PTR(UNIT_SOFT_REQUIRES), "Meta" }, + { "Wants", config_parse_deps, UINT_TO_PTR(UNIT_WANTS), "Meta" }, + { "Requisite", config_parse_deps, UINT_TO_PTR(UNIT_REQUISITE), "Meta" }, + { "SoftRequisite", config_parse_deps, UINT_TO_PTR(UNIT_SOFT_REQUISITE), "Meta" }, + { "Conflicts", config_parse_deps, UINT_TO_PTR(UNIT_CONFLICTS), "Meta" }, + { "Before", config_parse_deps, UINT_TO_PTR(UNIT_BEFORE), "Meta" }, + { "After", config_parse_deps, UINT_TO_PTR(UNIT_AFTER), "Meta" }, + + { "PIDFile", config_parse_path, &u->service.pid_file, "Service" }, + { "ExecStartPre", config_parse_exec, u->service.exec_command+SERVICE_EXEC_START_PRE, "Service" }, + { "ExecStart", config_parse_exec, u->service.exec_command+SERVICE_EXEC_START, "Service" }, + { "ExecStartPost", config_parse_exec, u->service.exec_command+SERVICE_EXEC_START_POST, "Service" }, + { "ExecReload", config_parse_exec, u->service.exec_command+SERVICE_EXEC_RELOAD, "Service" }, + { "ExecStop", config_parse_exec, u->service.exec_command+SERVICE_EXEC_STOP, "Service" }, + { "ExecStopPost", config_parse_exec, u->service.exec_command+SERVICE_EXEC_STOP_POST, "Service" }, + { "RestartSec", config_parse_usec, &u->service.restart_usec, "Service" }, + { "TimeoutSec", config_parse_usec, &u->service.timeout_usec, "Service" }, + { "Type", config_parse_service_type, &u->service, "Service" }, + { "Restart", config_parse_service_restart, &u->service, "Service" }, EXEC_CONTEXT_CONFIG_ITEMS(u->service.exec_context, "Service"), - { "ListenStream", config_parse_listen, &u->socket, "Socket" }, - { "ListenDatagram", config_parse_listen, &u->socket, "Socket" }, - { "ListenSequentialPacket", config_parse_listen, &u->socket, "Socket" }, - { "ListenFIFO", config_parse_listen, &u->socket, "Socket" }, - { "BindIPv6Only", config_parse_socket_bind, &u->socket, "Socket" }, - { "Backlog", config_parse_unsigned, &u->socket.backlog, "Socket" }, - { "ExecStartPre", config_parse_exec, &u->service.exec_command[SOCKET_EXEC_START_PRE], "Socket" }, - { "ExecStartPost", config_parse_exec, &u->service.exec_command[SOCKET_EXEC_START_POST], "Socket" }, - { "ExecStopPre", config_parse_exec, &u->service.exec_command[SOCKET_EXEC_STOP_PRE], "Socket" }, - { "ExecStopPost", config_parse_exec, &u->service.exec_command[SOCKET_EXEC_STOP_POST], "Socket" }, + { "ListenStream", config_parse_listen, &u->socket, "Socket" }, + { "ListenDatagram", config_parse_listen, &u->socket, "Socket" }, + { "ListenSequentialPacket", config_parse_listen, &u->socket, "Socket" }, + { "ListenFIFO", config_parse_listen, &u->socket, "Socket" }, + { "BindIPv6Only", config_parse_socket_bind, &u->socket, "Socket" }, + { "Backlog", config_parse_unsigned, &u->socket.backlog, "Socket" }, + { "BindToDevice", config_parse_bindtodevice, &u->socket, "Socket" }, + { "ExecStartPre", config_parse_exec, u->socket.exec_command+SOCKET_EXEC_START_PRE, "Socket" }, + { "ExecStartPost", config_parse_exec, u->socket.exec_command+SOCKET_EXEC_START_POST, "Socket" }, + { "ExecStopPre", config_parse_exec, u->socket.exec_command+SOCKET_EXEC_STOP_PRE, "Socket" }, + { "ExecStopPost", config_parse_exec, u->socket.exec_command+SOCKET_EXEC_STOP_POST, "Socket" }, EXEC_CONTEXT_CONFIG_ITEMS(u->socket.exec_context, "Socket"), EXEC_CONTEXT_CONFIG_ITEMS(u->automount.exec_context, "Automount"), @@ -627,14 +767,12 @@ int unit_load_fragment(Unit *u) { #undef EXEC_CONTEXT_CONFIG_ITEMS - char *t, *k; - int r; const char *sections[3]; - Iterator i; + char *k; + int r; Set *symlink_names; - - assert(u); - assert(u->meta.load_state == UNIT_STUB); + FILE *f; + char *filename, *id; sections[0] = "Meta"; sections[1] = section_table[u->meta.type]; @@ -643,51 +781,91 @@ int unit_load_fragment(Unit *u) { if (!(symlink_names = set_new(string_hash_func, string_compare_func))) return -ENOMEM; - /* Try to find a name we can load this with */ - SET_FOREACH(t, u->meta.names, i) { - FILE *f; - char *fn; + /* Instead of opening the path right away, we manually + * follow all symlinks and add their name to our unit + * name set while doing so */ + if (!(filename = path_make_absolute(path, unit_path()))) { + r = -ENOMEM; + goto finish; + } - /* Clear the symlink name set first */ - while ((k = set_steal_first(symlink_names))) - free(k); + if ((r = open_follow(&filename, &f, symlink_names, &id)) < 0) { + if (r == -ENOENT) + r = 0; /* returning 0 means: no suitable config file found */ - /* Instead of opening the path right away, we manually - * follow all symlinks and add their name to our unit - * name set while doing so */ - fn = t; - if ((r = open_follow((const char**) &fn, &f, symlink_names)) < 0) { - if (r == -ENOENT) - continue; + goto finish; + } - goto finish; - } + /* Now, parse the file contents */ + r = config_parse(filename, f, sections, items, u); + if (r < 0) + goto finish; - /* Now, parse the file contents */ - r = config_parse(fn, f, sections, items, u); - if (fn != t) - free(fn); - if (r < 0) + /* Let's try to add in all symlink names we found */ + while ((k = set_steal_first(symlink_names))) { + if ((r = unit_add_name(u, k)) < 0) goto finish; - /* Let's try to add in all symlink names we found */ - while ((k = set_steal_first(symlink_names))) - if ((r = unit_add_name(u, k)) < 0) - goto finish; - /* Yay, we succeeded! Now let's call this our identifier */ - u->meta.id = t; - goto finish; + free(k); } + unit_choose_id(u, id); + + free(u->meta.load_path); + u->meta.load_path = filename; + filename = NULL; - r = -ENOENT; + r = 1; /* returning 1 means: suitable config file found and loaded */ finish: while ((k = set_steal_first(symlink_names))) free(k); - set_free(symlink_names); + free(filename); + + return r; +} + +int unit_load_fragment(Unit *u) { + int r = 0; + ExecContext *c; + + assert(u); + assert(u->meta.load_state == UNIT_STUB); + + if (u->meta.load_path) + r = load_from_path(u, u->meta.load_path); + else { + Iterator i; + char *t; + + /* Try to find a name we can load this with */ + SET_FOREACH(t, u->meta.names, i) + if ((r = load_from_path(u, t)) != 0) + return r; + } + + if (u->meta.type == UNIT_SOCKET) + c = &u->socket.exec_context; + else if (u->meta.type == UNIT_SERVICE) + c = &u->service.exec_context; + else + c = NULL; + + if (r >= 0 && c && + (c->output == EXEC_KERNEL || c->output == EXEC_SYSLOG)) { + int k; + + /* If syslog or kernel logging is requested, make sure + * our own logging daemon is run first. */ + + if ((k = unit_add_dependency(u, UNIT_AFTER, u->meta.manager->special_units[SPECIAL_LOGGER_SOCKET])) < 0) + return k; + + if ((k = unit_add_dependency(u, UNIT_REQUIRES, u->meta.manager->special_units[SPECIAL_LOGGER_SOCKET])) < 0) + return k; + } return r; }