X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fsd-network.c;h=23af9409035877d8205fa951d5afb70599241950;hb=b5d3e1688133077ca20542a20dcd8919147e72e1;hp=74698736641aa18bb966aca1040ba5df3789b768;hpb=fe8db0c5ee3365a2fc80ee7ebffa238f9a0a2ae2;p=elogind.git

diff --git a/src/network/sd-network.c b/src/network/sd-network.c
index 746987366..23af94090 100644
--- a/src/network/sd-network.c
+++ b/src/network/sd-network.c
@@ -34,7 +34,7 @@
 #include "dhcp-lease-internal.h"
 
 _public_ int sd_network_get_link_state(unsigned index, char **state) {
-        char *p, *s = NULL;
+        _cleanup_free_ char *s = NULL, *p = NULL;
         int r;
 
         assert_return(index, -EINVAL);
@@ -44,23 +44,20 @@ _public_ int sd_network_get_link_state(unsigned index, char **state) {
                 return -ENOMEM;
 
         r = parse_env_file(p, NEWLINE, "STATE", &s, NULL);
-        free(p);
-
-        if (r == -ENOENT) {
-                free(s);
-                s = strdup("unknown");
-                if (!s)
-                        return -ENOMEM;
 
-                *state = s;
-                return 0;
-        } else if (r < 0) {
-                free(s);
+        if (r == -ENOENT)
+                return -ENODATA;
+        else if (r < 0)
                 return r;
-        } else if (!s)
+        else if (!s)
                 return -EIO;
 
+        if (streq(s, "unmanaged"))
+                return -EUNATCH;
+
         *state = s;
+        s = NULL;
+
         return 0;
 }