socket-utils: revert f1811313f42dc7ddaed3c47edc834c2bfd1309b2

':' in not a a valid interface name.

diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index c882b8a12adb33fb47bb2d1615cde4f1f43c48a9..77f81a60ba5b0f8865f10841037a1a4a0fb35f88 100644 (file)
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -887,7 +887,7 @@ bool ifname_valid(const char *p) {
                 if ((unsigned char) *p <= 32U)
                         return false;
 
-                if (*p == '/')
+                if (*p == ':' || *p == '/')
                         return false;
 
                 numeric = numeric && (*p >= '0' && *p <= '9');

diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c
index e1f5fd508457c64ef2694b758e89050fcfe82a08..d80613dc8459a5d13bc9aa2cf74bed3cb6063827 100644 (file)
--- a/src/test/test-socket-util.c
+++ b/src/test/test-socket-util.c
@@ -30,7 +30,6 @@
 static void test_ifname_valid(void) {
         assert(ifname_valid("foo"));
         assert(ifname_valid("eth0"));
-        assert(ifname_valid("eth0:0"));
 
         assert(!ifname_valid("0"));
         assert(!ifname_valid("99"));
@@ -45,7 +44,7 @@ static void test_ifname_valid(void) {
         assert(!ifname_valid("."));
         assert(!ifname_valid(".."));
         assert(ifname_valid("foo.bar"));
-        assert(ifname_valid("x:y"));
+        assert(!ifname_valid("x:y"));
 
         assert(ifname_valid("xxxxxxxxxxxxxxx"));
         assert(!ifname_valid("xxxxxxxxxxxxxxxx"));