summaryrefslogtreecommitdiffstats
path: root/release/sysinstall/tcpip.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1995-05-26 20:31:02 +0000
committerjkh <jkh@FreeBSD.org>1995-05-26 20:31:02 +0000
commit9a596693ad74d8bcb1b6c3764f0be96f1198f0ac (patch)
treee5b00ce261c9035a980e2ece6294990ed10a2d5d /release/sysinstall/tcpip.c
parent022b48b9827c88c7d4d9709724686de1bd2a45cf (diff)
downloadFreeBSD-src-9a596693ad74d8bcb1b6c3764f0be96f1198f0ac.zip
FreeBSD-src-9a596693ad74d8bcb1b6c3764f0be96f1198f0ac.tar.gz
Ask name of "other" ftp site in correct place.
Make TIOCCONS redirection for console messages work properly; we no longer open /dev/console for all I/O - we use the VTYs directly.
Diffstat (limited to 'release/sysinstall/tcpip.c')
-rw-r--r--release/sysinstall/tcpip.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c
index 28483e0..2baaf34 100644
--- a/release/sysinstall/tcpip.c
+++ b/release/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
/*
- * $Id: tcpip.c,v 1.16 1995/05/26 08:58:35 jkh Exp $
+ * $Id: tcpip.c,v 1.17 1995/05/26 19:28:06 jkh Exp $
*
* Copyright (c) 1995
* Gary J Palmer. All rights reserved.
@@ -216,7 +216,6 @@ tcpOpenDialog(Device *devp)
/* Initialise vars from previous device values */
if (devp->private) {
DevInfo *di = (DevInfo *)devp->private;
-
strcpy(ipaddr, di->ipaddr);
strcpy(netmask, di->netmask);
@@ -384,7 +383,7 @@ tcpOpenDialog(Device *devp)
}
/* BODGE ALERT! */
- if ((tmp = index(hostname, '.')) != NULL) {
+ if (((tmp = index(hostname, '.')) != NULL) && (strlen(domainname)==0)) {
strncpy(domainname, tmp + 1, strlen(tmp + 1));
domainname[strlen(tmp+1)] = '\0';
RefreshStringObj(layout[1].obj);
OpenPOWER on IntegriCloud