Don't encode the hostname as a FQDN by default as not all DHCP servers support this.

1 files changed, 10 insertions, 4 deletions

diff --git a/dhcpcd.c b/dhcpcd.c
index 209e7a2a..11e4b25c 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -650,11 +650,17 @@ main(int argc, char **argv)
 			goto abort;
 		}
 	}
-	if (strchr(options->hostname, '.')) {
+
+	if ((p = strchr(options->hostname, '.'))) {
 		if (options->fqdn == FQDN_DISABLE)
-			options->fqdn = FQDN_BOTH;
-	} else
-		options->fqdn = FQDN_DISABLE;
+			*p = '\0';
+	} else {
+		if (options->fqdn != FQDN_DISABLE) {
+			logger(LOG_WARNING, "hostname `%s' is not a FQDN",
+			       options->hostname);
+			options->fqdn = FQDN_DISABLE;
+		}
+	}
 
 	if (options->request_address.s_addr == 0 &&
 	    options->options & DHCPCD_INFORM)