X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsysctl%2Fsysctl.c;h=2d1ae6e8b17e8677f1580a6268c0ffe18c7a24d0;hp=3bfc454c04330da01e7a3b57df7072e3a0705a7e;hb=8d3d7072e609ef0e0fb37e1d19a29307d58146c3;hpb=0d0f0c50d3a1d90f03972a6abb82e6413daaa583 diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c index 3bfc454c0..2d1ae6e8b 100644 --- a/src/sysctl/sysctl.c +++ b/src/sysctl/sysctl.c @@ -30,31 +30,54 @@ #include "log.h" #include "strv.h" #include "util.h" -#include "strv.h" +#include "hashmap.h" #include "path-util.h" #include "conf-files.h" - -#define PROC_SYS_PREFIX "/proc/sys/" +#include "fileio.h" +#include "build.h" static char **arg_prefixes = NULL; +static const char conf_file_dirs[] = CONF_DIRS_NULSTR("sysctl"); + +static char* normalize_sysctl(char *s) { + char *n; + + n = strpbrk(s, "/."); + /* If the first separator is a slash, the path is + * assumed to be normalized and slashes remain slashes + * and dots remains dots. */ + if (!n || *n == '/') + return s; + + /* Otherwise, dots become slashes and slashes become + * dots. Fun. */ + while (n) { + if (*n == '.') + *n = '/'; + else + *n = '.'; + + n = strpbrk(n + 1, "/."); + } + + return s; +} + static int apply_sysctl(const char *property, const char *value) { - char *p, *n; + _cleanup_free_ char *p = NULL; + char *n; int r = 0, k; log_debug("Setting '%s' to '%s'", property, value); - p = new(char, sizeof(PROC_SYS_PREFIX) + strlen(property)); + p = new(char, strlen("/proc/sys/") + strlen(property) + 1); if (!p) return log_oom(); - n = stpcpy(p, PROC_SYS_PREFIX); + n = stpcpy(p, "/proc/sys/"); strcpy(n, property); - for (; *n; n++) - if (*n == '.') - *n = '/'; - if (!strv_isempty(arg_prefixes)) { char **i; bool good = false; @@ -67,14 +90,12 @@ static int apply_sysctl(const char *property, const char *value) { if (!good) { log_debug("Skipping %s", p); - free(p); return 0; } } - k = write_one_line_file(p, value); + k = write_string_file(p, value); if (k < 0) { - log_full(k == -ENOENT ? LOG_DEBUG : LOG_WARNING, "Failed to write '%s' to '%s': %s", value, p, strerror(-k)); @@ -82,28 +103,44 @@ static int apply_sysctl(const char *property, const char *value) { r = k; } - free(p); - return r; } -static int apply_file(const char *path, bool ignore_enoent) { - FILE *f; +static int apply_all(Hashmap *sysctl_options) { int r = 0; + char *property, *value; + Iterator i; + + assert(sysctl_options); + + HASHMAP_FOREACH_KEY(value, property, sysctl_options, i) { + int k; + + k = apply_sysctl(property, value); + if (k < 0 && r == 0) + r = k; + } + return r; +} + +static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_enoent) { + _cleanup_fclose_ FILE *f = NULL; + int r; assert(path); - if (!(f = fopen(path, "re"))) { - if (ignore_enoent && errno == ENOENT) + r = search_and_fopen_nulstr(path, "re", NULL, conf_file_dirs, &f); + if (r < 0) { + if (ignore_enoent && r == -ENOENT) return 0; - log_error("Failed to open file '%s', ignoring: %m", path); - return -errno; + return log_error_errno(r, "Failed to open file '%s', ignoring: %m", path); } - log_debug("apply: %s\n", path); + log_debug("parse: %s", path); while (!feof(f)) { - char l[LINE_MAX], *p, *value; + char l[LINE_MAX], *p, *value, *new_value, *property, *existing; + void *v; int k; if (!fgets(l, sizeof(l), f)) { @@ -111,19 +148,18 @@ static int apply_file(const char *path, bool ignore_enoent) { break; log_error("Failed to read file '%s', ignoring: %m", path); - r = -errno; - goto finish; + return -errno; } p = strstrip(l); - if (!*p) continue; - if (strchr(COMMENTS, *p)) + if (strchr(COMMENTS "\n", *p)) continue; - if (!(value = strchr(p, '='))) { + value = strchr(p, '='); + if (!value) { log_error("Line is not an assignment in file '%s': %s", path, value); if (r == 0) @@ -134,37 +170,62 @@ static int apply_file(const char *path, bool ignore_enoent) { *value = 0; value++; - if ((k = apply_sysctl(strstrip(p), strstrip(value))) < 0 && r == 0) - r = k; - } + p = normalize_sysctl(strstrip(p)); + value = strstrip(value); -finish: - fclose(f); + existing = hashmap_get2(sysctl_options, p, &v); + if (existing) { + if (streq(value, existing)) + continue; + + log_info("Overwriting earlier assignment of %s in file '%s'.", p, path); + free(hashmap_remove(sysctl_options, p)); + free(v); + } + + property = strdup(p); + if (!property) + return log_oom(); + + new_value = strdup(value); + if (!new_value) { + free(property); + return log_oom(); + } + + k = hashmap_put(sysctl_options, property, new_value); + if (k < 0) { + log_error_errno(k, "Failed to add sysctl variable %s to hashmap: %m", property); + free(property); + free(new_value); + return k; + } + } return r; } -static int help(void) { - +static void help(void) { printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n" "Applies kernel sysctl settings.\n\n" " -h --help Show this help\n" - " --prefix=PATH Only apply rules that apply to paths with the specified prefix\n", - program_invocation_short_name); - - return 0; + " --version Show package version\n" + " --prefix=PATH Only apply rules with the specified prefix\n" + , program_invocation_short_name); } static int parse_argv(int argc, char *argv[]) { enum { + ARG_VERSION = 0x100, ARG_PREFIX }; static const struct option options[] = { { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, ARG_VERSION }, { "prefix", required_argument, NULL, ARG_PREFIX }, - { NULL, 0, NULL, 0 } + {} }; int c; @@ -172,7 +233,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) switch (c) { @@ -180,20 +241,28 @@ static int parse_argv(int argc, char *argv[]) { help(); return 0; + case ARG_VERSION: + puts(PACKAGE_STRING); + puts(SYSTEMD_FEATURES); + return 0; + case ARG_PREFIX: { char *p; - char **l; - - for (p = optarg; *p; p++) - if (*p == '.') - *p = '/'; - l = strv_append(arg_prefixes, optarg); - if (!l) + /* We used to require people to specify absolute paths + * in /proc/sys in the past. This is kinda useless, but + * we need to keep compatibility. We now support any + * sysctl name available. */ + normalize_sysctl(optarg); + if (startswith(optarg, "/proc/sys")) + p = strdup(optarg); + else + p = strappend("/proc/sys/", optarg); + + if (!p) + return log_oom(); + if (strv_consume(&arg_prefixes, p) < 0) return log_oom(); - - strv_free(arg_prefixes); - arg_prefixes = l; break; } @@ -202,16 +271,15 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unhandled option"); } - } return 1; } int main(int argc, char *argv[]) { - int r = 0; + int r = 0, k; + Hashmap *sysctl_options; r = parse_argv(argc, argv); if (r <= 0) @@ -223,47 +291,45 @@ int main(int argc, char *argv[]) { umask(0022); + sysctl_options = hashmap_new(&string_hash_ops); + if (!sysctl_options) { + r = log_oom(); + goto finish; + } + + r = 0; + if (argc > optind) { int i; for (i = optind; i < argc; i++) { - int k; - - k = apply_file(argv[i], false); + k = parse_file(sysctl_options, argv[i], false); if (k < 0 && r == 0) r = k; } } else { - char **files, **f; - int k; + _cleanup_strv_free_ char **files = NULL; + char **f; - r = conf_files_list(&files, ".conf", - "/etc/sysctl.d", - "/run/sysctl.d", - "/usr/local/lib/sysctl.d", - "/usr/lib/sysctl.d", -#ifdef HAVE_SPLIT_USR - "/lib/sysctl.d", -#endif - NULL); + r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs); if (r < 0) { - log_error("Failed to enumerate sysctl.d files: %s", strerror(-r)); + log_error_errno(r, "Failed to enumerate sysctl.d files: %m"); goto finish; } STRV_FOREACH(f, files) { - k = apply_file(*f, true); + k = parse_file(sysctl_options, *f, true); if (k < 0 && r == 0) r = k; } + } - k = apply_file("/etc/sysctl.conf", true); - if (k < 0 && r == 0) - r = k; + k = apply_all(sysctl_options); + if (k < 0 && r == 0) + r = k; - strv_free(files); - } finish: + hashmap_free_free_free(sysctl_options); strv_free(arg_prefixes); return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;