aboutsummaryrefslogtreecommitdiff
path: root/release/sysinstall/tcpip.c
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1999-05-07 11:45:26 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1999-05-07 11:45:26 +0000
commit8a8beee081887760c252606e4931b3dfe9fb4fc0 (patch)
tree62b5a0e636045a26a7d15e9e2ac5ed68add4edee /release/sysinstall/tcpip.c
parentad4d616fa3816b266053c5f92190c21f51ff7de9 (diff)
Erm, correct mighty braino in previous "don't annoy me" change.
Notes
Notes: svn path=/head/; revision=46639
Diffstat (limited to 'release/sysinstall/tcpip.c')
-rw-r--r--release/sysinstall/tcpip.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c
index 06d908b30c71..8ccd6e821c74 100644
--- a/release/sysinstall/tcpip.c
+++ b/release/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
/*
- * $Id: tcpip.c,v 1.77 1999/05/06 11:05:19 jkh Exp $
+ * $Id: tcpip.c,v 1.78 1999/05/07 05:15:17 jkh Exp $
*
* Copyright (c) 1995
* Gary J Palmer. All rights reserved.
@@ -264,23 +264,26 @@ reenter:
cancelbutton = okbutton = 0;
while (layoutDialogLoop(ds_win, layout, &obj, &n, max, &cancelbutton, &cancel)) {
/* Prevent this from being irritating if user really means NO */
- if (!filled) {
- filled = 1;
+ if (filled < 3) {
/* Insert a default value for the netmask, 0xffffff00 is
- the most appropriate one (entire class C, or subnetted
- class A/B network). */
+ * the most appropriate one (entire class C, or subnetted
+ * class A/B network).
+ */
if (netmask[0] == '\0') {
strcpy(netmask, "255.255.255.0");
RefreshStringObj(layout[LAYOUT_NETMASK].obj);
+ ++filled;
}
if (!index(hostname, '.') && domainname[0]) {
strcat(hostname, ".");
strcat(hostname, domainname);
RefreshStringObj(layout[LAYOUT_HOSTNAME].obj);
+ ++filled;
}
else if (((tmp = index(hostname, '.')) != NULL) && !domainname[0]) {
- SAFE_STRCPY(domainname, tmp + 1);
- RefreshStringObj(layout[LAYOUT_DOMAINNAME].obj);
+ SAFE_STRCPY(domainname, tmp + 1);
+ RefreshStringObj(layout[LAYOUT_DOMAINNAME].obj);
+ ++filled;
}
}
}