X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.c;h=ced319de1dd9c9af06f72c296e09faae61a00aa0;hb=de45d726034f33afdb0a185e62fc61bf10a0acd2;hp=1020c7252512835e571169f4e1aceb163d85fc26;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;p=elogind.git

diff --git a/src/network/networkd.c b/src/network/networkd.c
index 1020c7252..ced319de1 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -46,7 +46,7 @@ int main(int argc, char *argv[]) {
 
         r = get_user_creds(&user, &uid, &gid, NULL, NULL);
         if (r < 0) {
-                log_error_errno(-r, "Cannot resolve user name %s: %m", user);
+                log_error_errno(r, "Cannot resolve user name %s: %m", user);
                 goto out;
         }
 
@@ -54,19 +54,22 @@ int main(int argc, char *argv[]) {
          * watches in. */
         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_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("Could not create runtime directory 'leases': %s",
+                log_error_errno(r, "Could not create runtime directory 'leases': %m");
+
+        r = mkdir_safe_label("/run/systemd/netif/lldp", 0755, uid, gid);
+        if (r < 0)
+                log_error("Could not create runtime directory 'lldp': %s",
                           strerror(-r));
 
+
         r = drop_privileges(uid, gid,
                             (1ULL << CAP_NET_ADMIN) |
                             (1ULL << CAP_NET_BIND_SERVICE) |
@@ -79,37 +82,43 @@ int main(int argc, char *argv[]) {
 
         r = manager_new(&m);
         if (r < 0) {
-                log_error_errno(-r, "Could not create manager: %m");
+                log_error_errno(r, "Could not create manager: %m");
                 goto out;
         }
 
         r = manager_udev_listen(m);
         if (r < 0) {
-                log_error_errno(-r, "Could not connect to udev: %m");
+                log_error_errno(r, "Could not connect to udev: %m");
                 goto out;
         }
 
         r = manager_rtnl_listen(m);
         if (r < 0) {
-                log_error_errno(-r, "Could not connect to rtnl: %m");
+                log_error_errno(r, "Could not connect to rtnl: %m");
                 goto out;
         }
 
         r = manager_bus_listen(m);
         if (r < 0) {
-                log_error_errno(-r, "Could not connect to system bus: %m");
+                log_error_errno(r, "Could not connect to system bus: %m");
                 goto out;
         }
 
         r = manager_load_config(m);
         if (r < 0) {
-                log_error_errno(-r, "Could not load configuration files: %m");
+                log_error_errno(r, "Could not load configuration files: %m");
                 goto out;
         }
 
         r = manager_rtnl_enumerate_links(m);
         if (r < 0) {
-                log_error_errno(-r, "Could not enumerate links: %m");
+                log_error_errno(r, "Could not enumerate links: %m");
+                goto out;
+        }
+
+        r = manager_rtnl_enumerate_addresses(m);
+        if (r < 0) {
+                log_error_errno(r, "Could not enumerate links: %m");
                 goto out;
         }
 
@@ -119,7 +128,7 @@ int main(int argc, char *argv[]) {
 
         r = sd_event_loop(m->event);
         if (r < 0) {
-                log_error_errno(-r, "Event loop failed: %m");
+                log_error_errno(r, "Event loop failed: %m");
                 goto out;
         }