resolved: add missing error code check when initializing DNS-over-TLS

[thirdparty/systemd.git] / src / resolve / resolvectl.c

diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index 7b9e13f3f63bc93017ac5a6dea17a17690e4d76d..6c5b58994423c73e59fce0e1b024a63b2d3e57a1 100644 (file)
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -14,6 +14,7 @@
 #include "bus-util.h"
 #include "dns-domain.h"
 #include "escape.h"
+#include "format-util.h"
 #include "gcrypt-util.h"
 #include "in-addr-util.h"
 #include "main-func.h"
@@ -76,24 +77,10 @@ typedef enum StatusMode {
         STATUS_NTA,
 } StatusMode;
 
-static int parse_ifindex_and_warn(const char *s) {
-        int ifi;
-
-        assert(s);
-
-        if (parse_ifindex(s, &ifi) < 0) {
-                ifi = if_nametoindex(s);
-                if (ifi <= 0)
-                        return log_error_errno(errno, "Unknown interface '%s': %m", s);
-        }
-
-        return ifi;
-}
-
 int ifname_mangle(const char *s) {
         _cleanup_free_ char *iface = NULL;
         const char *dot;
-        int ifi;
+        int ifi, r;
 
         assert(s);
 
@@ -107,23 +94,19 @@ int ifname_mangle(const char *s) {
         if (!iface)
                 return log_oom();
 
-        if (parse_ifindex(iface, &ifi) < 0) {
-                ifi = if_nametoindex(iface);
-                if (ifi <= 0) {
-                        if (errno == ENODEV && arg_ifindex_permissive) {
-                                log_debug("Interface '%s' not found, but -f specified, ignoring.", iface);
-                                return 0; /* done */
-                        }
-
-                        return log_error_errno(errno, "Unknown interface '%s': %m", iface);
+        r = parse_ifindex_or_ifname(iface, &ifi);
+        if (r < 0) {
+                if (r == -ENODEV && arg_ifindex_permissive) {
+                        log_debug("Interface '%s' not found, but -f specified, ignoring.", iface);
+                        return 0; /* done */
                 }
-        }
 
-        if (arg_ifindex > 0 && arg_ifindex != ifi) {
-                log_error("Specified multiple different interfaces. Refusing.");
-                return -EINVAL;
+                return log_error_errno(r, "Unknown interface '%s': %m", iface);
         }
 
+        if (arg_ifindex > 0 && arg_ifindex != ifi)
+                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Specified multiple different interfaces. Refusing.");
+
         arg_ifindex = ifi;
         free_and_replace(arg_ifname, iface);
 
@@ -158,12 +141,12 @@ static void print_source(uint64_t flags, usec_t rtt) {
 }
 
 static void print_ifindex_comment(int printed_so_far, int ifindex) {
-        char ifname[IF_NAMESIZE];
+        char ifname[IF_NAMESIZE + 1];
 
         if (ifindex <= 0)
                 return;
 
-        if (!if_indextoname(ifindex, ifname))
+        if (!format_ifname(ifindex, ifname))
                 log_warning_errno(errno, "Failed to resolve interface name for index %i, ignoring: %m", ifindex);
         else
                 printf("%*s%s-- link: %s%s",
@@ -1400,7 +1383,7 @@ static int status_ifindex(sd_bus *bus, int ifindex, const char *name, StatusMode
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
         _cleanup_(link_info_clear) struct link_info link_info = {};
         _cleanup_free_ char *ifi = NULL, *p = NULL;
-        char ifname[IF_NAMESIZE] = "";
+        char ifname[IF_NAMESIZE + 1] = "";
         char **i;
         int r;
 
@@ -1408,7 +1391,7 @@ static int status_ifindex(sd_bus *bus, int ifindex, const char *name, StatusMode
         assert(ifindex > 0);
 
         if (!name) {
-                if (!if_indextoname(ifindex, ifname))
+                if (!format_ifname(ifindex, ifname))
                         return log_error_errno(errno, "Failed to resolve interface name for %i: %m", ifindex);
 
                 name = ifname;
@@ -1845,9 +1828,11 @@ static int verb_status(int argc, char **argv, void *userdata) {
                 STRV_FOREACH(ifname, argv + 1) {
                         int ifindex;
 
-                        ifindex = parse_ifindex_and_warn(*ifname);
-                        if (ifindex < 0)
+                        q = parse_ifindex_or_ifname(*ifname, &ifindex);
+                        if (q < 0) {
+                                log_error_errno(q, "Unknown interface '%s', ignoring: %m", *ifname);
                                 continue;
+                        }
 
                         q = status_ifindex(bus, ifindex, NULL, STATUS_ALL, &empty_line);
                         if (q < 0)
@@ -1860,12 +1845,12 @@ static int verb_status(int argc, char **argv, void *userdata) {
 }
 
 static int log_interface_is_managed(int r, int ifindex) {
-        char ifname[IFNAMSIZ];
+        char ifname[IF_NAMESIZE + 1];
 
         return log_error_errno(r,
                                "The specified interface %s is managed by systemd-networkd. Operation refused.\n"
                                "Please configure DNS settings for systemd-networkd managed interfaces directly in their .network files.",
-                               strna(if_indextoname(ifindex, ifname)));
+                               strna(format_ifname(ifindex, ifname)));
 }
 
 static int verb_dns(int argc, char **argv, void *userdata) {
@@ -3139,6 +3124,7 @@ static int run(int argc, char **argv) {
         int r;
 
         setlocale(LC_ALL, "");
+        log_show_color(true);
         log_parse_environment();
         log_open();