[src/netbsd-6]: src/distrib/utils/sysinst Pull up following revision(s) (requ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8c9951c668cf
branches:  netbsd-6
changeset: 774623:8c9951c668cf
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Oct 01 17:43:00 2012 +0000

description:
Pull up following revision(s) (requested by jdf in ticket #570):
        distrib/utils/sysinst/net.c: revision 1.133
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.

diffstat:

 distrib/utils/sysinst/net.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r 1a46d392a055 -r 8c9951c668cf distrib/utils/sysinst/net.c
--- a/distrib/utils/sysinst/net.c       Mon Oct 01 17:37:28 2012 +0000
+++ b/distrib/utils/sysinst/net.c       Mon Oct 01 17:43:00 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net.c,v 1.130.2.1 2012/05/17 18:57:11 sborrill Exp $   */
+/*     $NetBSD: net.c,v 1.130.2.2 2012/10/01 17:43:00 riz Exp $        */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -435,9 +435,9 @@
 
        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));