X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fresolve%2Fresolved.c;h=271247ca3fca7ab5874993e54237dfea91c880bd;hb=32a568fb90bf0a22a3007fa670305403a5d0bb72;hp=82f43d68031b398116215974c71d34e9a8a88a9f;hpb=091a364c802e34a58f3260c9cb5db9b75c62215c;p=elogind.git

diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index 82f43d680..271247ca3 100644
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -21,65 +21,94 @@
 
 #include "sd-event.h"
 #include "sd-daemon.h"
-
-#include "resolved.h"
-
 #include "mkdir.h"
+#include "capability.h"
+#include "selinux-util.h"
+
+#include "resolved-manager.h"
+#include "resolved-conf.h"
 
 int main(int argc, char *argv[]) {
-        _cleanup_manager_free_ Manager *m = NULL;
+        _cleanup_(manager_freep) Manager *m = NULL;
+        const char *user = "systemd-resolve";
+        uid_t uid;
+        gid_t gid;
         int r;
 
         log_set_target(LOG_TARGET_AUTO);
         log_parse_environment();
         log_open();
 
-        umask(0022);
-
         if (argc != 1) {
                 log_error("This program takes no arguments.");
                 r = -EINVAL;
-                goto out;
+                goto finish;
+        }
+
+        umask(0022);
+
+        r = mac_selinux_init(NULL);
+        if (r < 0) {
+                log_error_errno(r, "SELinux setup failed: %m");
+                goto finish;
+        }
+
+        r = get_user_creds(&user, &uid, &gid, NULL, NULL);
+        if (r < 0) {
+                log_error_errno(r, "Cannot resolve user name %s: %m", user);
+                goto finish;
         }
 
         /* Always create the directory where resolv.conf will live */
-        r = mkdir_label("/run/systemd/network", 0755);
+        r = mkdir_safe_label("/run/systemd/resolve", 0755, uid, gid);
+        if (r < 0) {
+                log_error_errno(r, "Could not create runtime directory: %m");
+                goto finish;
+        }
+
+        r = drop_privileges(uid, gid, 0);
         if (r < 0)
-                log_error("Could not create runtime directory: %s",
-                          strerror(-r));
+                goto finish;
+
+        assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0);
 
         r = manager_new(&m);
         if (r < 0) {
-                log_error("Could not create manager: %s", strerror(-r));
-                goto out;
+                log_error_errno(r, "Could not create manager: %m");
+                goto finish;
         }
 
-        r = manager_network_monitor_listen(m);
-        if (r < 0) {
-                log_error("Could not listen for network events: %s", strerror(-r));
-                goto out;
-        }
+        r = manager_parse_config_file(m);
+        if (r < 0)
+                log_warning_errno(r, "Failed to parse configuration file: %m");
 
-        /* write out default resolv.conf to avoid a
-         * dangling symlink */
-        r = manager_update_resolv_conf(m);
+        r = manager_start(m);
         if (r < 0) {
-                log_error("Could not create resolv.conf: %s", strerror(-r));
-                goto out;
+                log_error_errno(r, "Failed to start manager: %m");
+                goto finish;
         }
 
+        /* Write finish default resolv.conf to avoid a dangling
+         * symlink */
+        r = manager_write_resolv_conf(m);
+        if (r < 0)
+                log_warning_errno(r, "Could not create resolv.conf: %m");
+
         sd_notify(false,
                   "READY=1\n"
                   "STATUS=Processing requests...");
 
         r = sd_event_loop(m->event);
         if (r < 0) {
-                log_error("Event loop failed: %s", strerror(-r));
-                goto out;
+                log_error_errno(r, "Event loop failed: %m");
+                goto finish;
         }
 
-out:
+        sd_event_get_exit_code(m->event, &r);
+
+finish:
         sd_notify(false,
+                  "STOPPING=1\n"
                   "STATUS=Shutting down...");
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;