X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fnetwork%2Fnetworkd-netdev-tuntap.c;h=4f449aea4820eeda113659a9714e2216d8dc1589;hb=bfcdba8d565041275319e5b1605c543d243ad7c4;hp=7767d7550739d504add260f38ffe1b26275f2230;hpb=79008bddf679a5e0900369950eb346c9fa687107;p=elogind.git

diff --git a/src/network/networkd-netdev-tuntap.c b/src/network/networkd-netdev-tuntap.c
index 7767d7550..4f449aea4 100644
--- a/src/network/networkd-netdev-tuntap.c
+++ b/src/network/networkd-netdev-tuntap.c
@@ -95,8 +95,8 @@ static int netdev_tuntap_add(NetDev *netdev, struct ifreq *ifr) {
 
                 r = get_user_creds(&user, &uid, NULL, NULL, NULL);
                 if (r < 0) {
-                        log_error("Cannot resolve user name %s: %s",
-                                  t->user_name, strerror(-r));
+                        log_error_errno(r, "Cannot resolve user name %s: %m",
+                                        t->user_name);
                         return 0;
                 }
 
@@ -114,8 +114,8 @@ static int netdev_tuntap_add(NetDev *netdev, struct ifreq *ifr) {
 
                 r = get_group_creds(&group, &gid);
                 if (r < 0) {
-                        log_error("Cannot resolve group name %s: %s",
-                                  t->group_name, strerror(-r));
+                        log_error_errno(r, "Cannot resolve group name %s: %m",
+                                        t->group_name);
                         return 0;
                 }
 
@@ -171,17 +171,8 @@ static void tuntap_done(NetDev *netdev) {
 }
 
 static int tuntap_verify(NetDev *netdev, const char *filename) {
-        TunTap *t = NULL;
-
         assert(netdev);
 
-        if (netdev->kind == NETDEV_KIND_TUN)
-                t = TUN(netdev);
-        else
-                t = TAP(netdev);
-
-        assert(t);
-
         if (netdev->mtu) {
                 log_warning_netdev(netdev, "MTU configured for %s, ignoring",
                                    netdev_kind_to_string(netdev->kind));