Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent sysinst from setting an fqdn in rc.conf when the user entered no domain

Browse Source 
(i.e., sets only the hostname).  Fix for PR install/46946.
This commit is contained in:
jdf 2012-09-23 17:37:51 +00:00
parent 2b3d1ee8a7
commit db32c99923
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distrib/utils/sysinst/net.c
View File

@ -1,4 +1,4 @@
/* $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.
@ -435,9 +435,9 @@ recombine_host_domain(void)
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));