X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.c;h=0aaef8b79232c9658dc1ce9704d588dd04a416ee;hp=f0e6ad5201a5476f35ceb1e20cbc9b030313cb1c;hb=73432d67b590c8c8954cf2f8954d174a55d58c7b;hpb=0ea51a1129b9984a3c6d96cef1b0e33c99b5e9cf

diff --git a/src/network/networkd.c b/src/network/networkd.c
index f0e6ad520..0aaef8b79 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "capability.h"
 #include "sd-event.h"
 #include "sd-daemon.h"
 
@@ -26,6 +27,9 @@
 
 int main(int argc, char *argv[]) {
         _cleanup_manager_free_ Manager *m = NULL;
+        const char *user = "systemd-network";
+        uid_t uid;
+        gid_t gid;
         int r;
 
         log_set_target(LOG_TARGET_AUTO);
@@ -40,79 +44,81 @@ int main(int argc, char *argv[]) {
                 goto out;
         }
 
+        r = get_user_creds(&user, &uid, &gid, NULL, NULL);
+        if (r < 0) {
+                log_error_errno(r, "Cannot resolve user name %s: %m", user);
+                goto out;
+        }
+
         /* Always create the directories people can create inotify
          * watches in. */
-        r = mkdir_label("/run/systemd/network", 0755);
+        r = mkdir_safe_label("/run/systemd/netif", 0755, uid, gid);
         if (r < 0)
-                log_error("Could not create runtime directory: %s",
-                          strerror(-r));
+                log_error_errno(r, "Could not create runtime directory: %m");
 
-        r = mkdir_label("/run/systemd/network/links", 0755);
+        r = mkdir_safe_label("/run/systemd/netif/links", 0755, uid, gid);
         if (r < 0)
-                log_error("Could not create runtime directory 'links': %s",
-                          strerror(-r));
+                log_error_errno(r, "Could not create runtime directory 'links': %m");
+
+        r = mkdir_safe_label("/run/systemd/netif/leases", 0755, uid, gid);
+        if (r < 0)
+                log_error_errno(r, "Could not create runtime directory 'leases': %m");
 
-        r = mkdir_label("/run/systemd/network/leases", 0755);
+        r = mkdir_safe_label("/run/systemd/netif/lldp", 0755, uid, gid);
         if (r < 0)
-                log_error("Could not create runtime directory 'leases': %s",
+                log_error("Could not create runtime directory 'lldp': %s",
                           strerror(-r));
 
-        r = manager_new(&m);
-        if (r < 0) {
-                log_error("Could not create manager: %s", strerror(-r));
-                goto out;
-        }
 
-        r = manager_udev_listen(m);
-        if (r < 0) {
-                log_error("Could not connect to udev: %s", strerror(-r));
+        r = drop_privileges(uid, gid,
+                            (1ULL << CAP_NET_ADMIN) |
+                            (1ULL << CAP_NET_BIND_SERVICE) |
+                            (1ULL << CAP_NET_BROADCAST) |
+                            (1ULL << CAP_NET_RAW));
+        if (r < 0)
                 goto out;
-        }
 
-        r = manager_rtnl_listen(m);
-        if (r < 0) {
-                log_error("Could not connect to rtnl: %s", strerror(-r));
-                goto out;
-        }
+        assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0);
 
-        r = manager_bus_listen(m);
+        r = manager_new(&m);
         if (r < 0) {
-                log_error("Could not connect to system bus: %s", strerror(-r));
+                log_error_errno(r, "Could not create manager: %m");
                 goto out;
         }
 
         r = manager_load_config(m);
         if (r < 0) {
-                log_error("Could not load configuration files: %s", strerror(-r));
+                log_error_errno(r, "Could not load configuration files: %m");
                 goto out;
         }
 
-        r = manager_udev_enumerate_links(m);
+        r = manager_rtnl_enumerate_links(m);
         if (r < 0) {
-                log_error("Could not enumerate links: %s", strerror(-r));
+                log_error_errno(r, "Could not enumerate links: %m");
                 goto out;
         }
 
-        /* write out empty resolv.conf to avoid a
-         * dangling symlink */
-        r = manager_update_resolv_conf(m);
+        r = manager_rtnl_enumerate_addresses(m);
         if (r < 0) {
-                log_error("Could not create resolv.conf: %s", strerror(-r));
+                log_error_errno(r, "Could not enumerate links: %m");
                 goto out;
         }
 
+        log_info("Enumeration completed");
+
         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));
+                log_error_errno(r, "Event loop failed: %m");
                 goto out;
         }
 
 out:
         sd_notify(false,
+                  "STOPPING=1\n"
                   "STATUS=Shutting down...");
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;