X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fresolve%2Fresolved.c;h=ef416e5caeea1c9b2b60ff3c8fe8773ba88008e7;hp=53f09db73baaf20eac2ae6a65189d9564f454bcb;hb=a5a807e63a50314e190e9166d8a453cd8dd258e3;hpb=b9e7a9d870ac41d4db954edd52a1f5dd7d153389

diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index 53f09db73..ef416e5ca 100644
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -21,14 +21,14 @@
 
 #include "sd-event.h"
 #include "sd-daemon.h"
-
-#include "resolved.h"
-
 #include "mkdir.h"
 #include "capability.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;
@@ -38,54 +38,61 @@ int main(int argc, char *argv[]) {
         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 = label_init(NULL);
+        if (r < 0) {
+                log_error("SELinux setup failed: %s", strerror(-r));
+                goto finish;
         }
 
         r = get_user_creds(&user, &uid, &gid, NULL, NULL);
         if (r < 0) {
                 log_error("Cannot resolve user name %s: %s", user, strerror(-r));
-                goto out;
+                goto finish;
         }
 
         /* Always create the directory where resolv.conf will live */
         r = mkdir_safe_label("/run/systemd/resolve", 0755, uid, gid);
         if (r < 0) {
-                log_error("Could not create runtime directory: %s",
-                          strerror(-r));
-                goto out;
+                log_error("Could not create runtime directory: %s", strerror(-r));
+                goto finish;
         }
 
         r = drop_privileges(uid, gid, 0);
         if (r < 0)
-                goto out;
+                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;
+                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("Failed to parse configuration file: %s", strerror(-r));
 
-        /* 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("Failed to start manager: %s", strerror(-r));
+                goto finish;
         }
 
+        /* Write finish default resolv.conf to avoid a dangling
+         * symlink */
+        r = manager_write_resolv_conf(m);
+        if (r < 0)
+                log_warning("Could not create resolv.conf: %s", strerror(-r));
+
         sd_notify(false,
                   "READY=1\n"
                   "STATUS=Processing requests...");
@@ -93,11 +100,14 @@ int main(int argc, char *argv[]) {
         r = sd_event_loop(m->event);
         if (r < 0) {
                 log_error("Event loop failed: %s", strerror(-r));
-                goto out;
+                goto finish;
         }
 
-out:
+        sd_event_get_exit_code(m->event, &r);
+
+finish:
         sd_notify(false,
+                  "STOPPIN=1\n"
                   "STATUS=Shutting down...");
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;