From: Roy Marples <roy@marples.name>
Date: Fri, 6 Mar 2026 11:48:30 +0000 (+0000)
Subject: ntp: Build new_ntp_servers without superfluous spaces
X-Git-Tag: v10.3.1~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84c95b689c3903a66b6f5688ee26696be8c3ad60;p=thirdparty%2Fdhcpcd.git

ntp: Build new_ntp_servers without superfluous spaces

Fixes #582.
---

diff --git a/hooks/50-ntp.conf b/hooks/50-ntp.conf
index cbaa3744..c6b36933 100644
--- a/hooks/50-ntp.conf
+++ b/hooks/50-ntp.conf
@@ -131,7 +131,9 @@ remove_ntp_conf()
 # For ease of use, map DHCP6 names onto our DHCP4 names
 case "$reason" in
 BOUND6|RENEW6|REBIND6|REBOOT6|INFORM6)
-	new_ntp_servers="$new_dhcp6_sntp_servers $new_dhcp6_ntp_server_addr $new_dhcp6_ntp_server_fqdn"
+	new_ntp_servers="$new_dhcp6_sntp_servers"
+	new_ntp_servers="$new_ntp_servers${new_ntp_servers:+ }$new_dhcp6_ntp_server_addr"
+	new_ntp_servers="$new_ntp_servers${new_ntp_servers:+ }$new_dhcp6_ntp_server_fqdn"
 ;;
 esac
 
diff --git a/hooks/50-timesyncd.conf b/hooks/50-timesyncd.conf
index 8ee722bd..f213bd8c 100644
--- a/hooks/50-timesyncd.conf
+++ b/hooks/50-timesyncd.conf
@@ -54,7 +54,9 @@ add_timesyncd_conf()
 # For ease of use, map DHCP6 names onto our DHCP4 names
 case "$reason" in
 BOUND6|RENEW6|REBIND6|REBOOT6|INFORM6)
-	new_ntp_servers="$new_dhcp6_sntp_servers $new_dhcp6_ntp_server_addr $new_dhcp6_ntp_server_fqdn"
+	new_ntp_servers="$new_dhcp6_sntp_servers"
+	new_ntp_servers="$new_ntp_servers${new_ntp_servers:+ }$new_dhcp6_ntp_server_addr"
+	new_ntp_servers="$new_ntp_servers${new_ntp_servers:+ }$new_dhcp6_ntp_server_fqdn"
 ;;
 esac