Sun Sep 23 17:37:51 2012 UTC ()

Prevent sysinst from setting an fqdn in rc.conf when the user entered no domain
(i.e., sets only the hostname).  Fix for PR install/46946.


(jdf)

diff -r1.132 -r1.133 src/distrib/utils/sysinst/net.c

--- src/distrib/utils/sysinst/Attic/net.c 2012/05/01 18:28:47	1.132
+++ src/distrib/utils/sysinst/Attic/net.c 2012/09/23 17:37:51	1.133

 @@ -1,14 +1,14 @@
-/*	$NetBSD: net.c,v 1.132 2012/05/01 18:28:47 riz Exp $	*/
+/*	$NetBSD: net.c,v 1.133 2012/09/23 17:37:51 jdf Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -425,29 +425,29 @@ get_host_info(void)
 /*
  * recombine name parts split in get_host_info and config_network
  * (common code moved here from write_etc_hosts)
  */
 static char *
 recombine_host_domain(void)
+{
 	static char recombined[MAXHOSTNAMELEN + 1];
 	int l = strlen(net_host) - strlen(net_domain);
 	strlcpy(recombined, net_host, sizeof(recombined));
-	if (l <= 0 ||
+	if (strlen(net_domain) != 0 && (l <= 0 ||
 	    net_host[l - 1] != '.' ||
-	    strcasecmp(net_domain, net_host + l) != 0) {
+	    strcasecmp(net_domain, net_host + l) != 0)) {
 		/* net_host isn't an FQDN. */
 		strlcat(recombined, ".", sizeof(recombined));
 		strlcat(recombined, net_domain, sizeof(recombined));
+	}
 	return recombined;
+}
 #ifdef INET6
 static int
 is_v6kernel(void)
+{
 	int s;