From: Ronan Pigott <ronan@rjp.ie>
Date: Thu, 29 Jun 2023 23:38:26 +0000 (-0700)
Subject: networkctl: show captive portal configuration in link status
X-Git-Tag: v254-rc1~51^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e469d2a2ed79362f89248c5f3ceb4c13275f78bb;p=thirdparty%2Fsystemd.git

networkctl: show captive portal configuration in link status
---

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 0037c8e8ceb..ec60c5e6b8c 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -1678,7 +1678,7 @@ static int link_status_one(
 
         _cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **sip = NULL, **search_domains = NULL,
                 **route_domains = NULL, **link_dropins = NULL, **network_dropins = NULL;
-        _cleanup_free_ char *t = NULL, *network = NULL, *iaid = NULL, *duid = NULL,
+        _cleanup_free_ char *t = NULL, *network = NULL, *iaid = NULL, *duid = NULL, *captive_portal = NULL,
                 *setup_state = NULL, *operational_state = NULL, *online_state = NULL, *activation_policy = NULL;
         const char *driver = NULL, *path = NULL, *vendor = NULL, *model = NULL, *link = NULL,
                 *on_color_operational, *off_color_operational, *on_color_setup, *off_color_setup, *on_color_online;
@@ -1706,6 +1706,7 @@ static int link_status_one(
         (void) sd_network_link_get_route_domains(info->ifindex, &route_domains);
         (void) sd_network_link_get_ntp(info->ifindex, &ntp);
         (void) sd_network_link_get_sip(info->ifindex, &sip);
+        (void) sd_network_link_get_captive_portal(info->ifindex, &captive_portal);
         (void) sd_network_link_get_network_file(info->ifindex, &network);
         (void) sd_network_link_get_network_file_dropins(info->ifindex, &network_dropins);
         (void) sd_network_link_get_carrier_bound_to(info->ifindex, &carrier_bound_to);
@@ -2358,6 +2359,9 @@ static int link_status_one(
                         return table_log_add_error(r);
         }
 
+        if (captive_portal)
+                table_add_string_line(table, "Captive Portal:", captive_portal);
+
         if (lease) {
                 const void *client_id;
                 size_t client_id_len;