From: Roy Marples <roy@marples.name>
Date: Fri, 16 Jun 2017 08:38:29 +0000 (+0100)
Subject: Clarify RFC952 and RFC1123 to justify domain name restriction dhcpcd imposes.
X-Git-Tag: v7.0.0-rc2~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb2d5677adeb2f993db34ef43b5e8999b1e3432a;p=thirdparty%2Fdhcpcd.git

Clarify RFC952 and RFC1123 to justify domain name restriction dhcpcd imposes.
---

diff --git a/hooks/dhcpcd-run-hooks.in b/hooks/dhcpcd-run-hooks.in
index 076ffb2b..4490fa9b 100644
--- a/hooks/dhcpcd-run-hooks.in
+++ b/hooks/dhcpcd-run-hooks.in
@@ -198,8 +198,7 @@ syslog()
 	fi
 }
 
-# Check for a valid domain name as per RFC1123 with the exception of
-# allowing - and _ as they seem to be widely used.
+# Check for a valid name as per RFC952 and RFC1123 section 2.1
 valid_domainname()
 {
 	local name="$1" label
diff --git a/src/dhcp-common.c b/src/dhcp-common.c
index c6dc2b9f..51f1b012 100644
--- a/src/dhcp-common.c
+++ b/src/dhcp-common.c
@@ -415,8 +415,7 @@ decode_rfc1035(char *out, size_t len, const uint8_t *p, size_t pl)
 	return (ssize_t)o_len;
 }
 
-/* Check for a valid domain name as per RFC1123 with the exception of
- * allowing - and _ (but not at start or end) as they seem to be widely used. */
+/* Check for a valid name as per RFC952 and RFC1123 section 2.1 */
 static int
 valid_domainname(char *lbl, int type)
 {