From 65878e4c921bba27a5b3633898ce21e49043f98f Mon Sep 17 00:00:00 2001 From: jkh Date: Thu, 4 Jul 1996 23:12:05 +0000 Subject: Fix some minor reported bogons from the BETA --- usr.sbin/sade/config.c | 17 +++++++++------ usr.sbin/sade/install.c | 4 ++-- usr.sbin/sade/menus.c | 46 ++++++++++++++++++++-------------------- usr.sbin/sade/sade.h | 4 ++-- usr.sbin/sysinstall/config.c | 17 +++++++++------ usr.sbin/sysinstall/install.c | 4 ++-- usr.sbin/sysinstall/menus.c | 46 ++++++++++++++++++++-------------------- usr.sbin/sysinstall/sysinstall.h | 4 ++-- 8 files changed, 74 insertions(+), 68 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 823857a..cba9514 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/config.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: config.c,v 1.41 1996/06/29 03:43:17 jkh Exp $ + * $Id: config.c,v 1.42 1996/07/02 09:12:34 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -339,13 +339,16 @@ configSaverTimeout(dialogMenuItem *self) int configNTP(dialogMenuItem *self) { - if (variable_get(VAR_NTPDATE)) { - variable_unset(VAR_NTPDATE); - return DITEM_SUCCESS | DITEM_REDRAW; + int status; + + status = variable_get_value(VAR_NTPDATE, "Enter the name of an NTP server") ? DITEM_SUCCESS : DITEM_FAILURE; + if (status == DITEM_SUCCESS) { + static char tmp[255]; + + snprintf(tmp, 255, "%s=%s", VAR_NTPDATE, variable_get(VAR_NTPDATE)); + self->aux = (int)tmp; } - else - return variable_get_value(VAR_NTPDATE, "Enter the name of an NTP server") - ? DITEM_SUCCESS : DITEM_FAILURE; + return status; } int diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 2a91fba..3031e3f 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.105 1996/07/02 01:03:42 jkh Exp $ + * $Id: install.c,v 1.106 1996/07/02 10:57:52 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -250,7 +250,7 @@ installFixitFloppy(dialogMenuItem *self) /* Link the spwd.db file */ if (DITEM_STATUS(Mkdir("/etc", NULL)) != DITEM_SUCCESS) msgConfirm("Unable to create an /etc directory! Things are weird on this floppy.."); - else if (symlink("/mnt2/etc/spwd.db", "/etc/spwd.db") == -1) + else if (symlink("/mnt2/etc/spwd.db", "/etc/spwd.db") == -1 && errno != EEXIST) msgConfirm("Couldn't symlink the /etc/spwd.db file! I'm not sure I like this.."); if (!file_readable(TERMCAP_FILE)) create_termcap(); diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index b8036b4..73026e2 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.77 1996/07/02 01:03:47 jkh Exp $ + * $Id: menus.c,v 1.78 1996/07/02 10:57:54 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -1039,10 +1039,10 @@ aspects of your system's network configuration.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" }, { "Gated", "This machine wants to run gated instead of routed", dmenuVarCheck, configGated, NULL, "gated" }, - { "Novell", "Install the Novell client/server demo package", + { "Netcon", "Install the Novell client/server demo package", dmenuVarCheck, configNovell, NULL, "novell" }, { "Ntpdate", "Select a clock-syncronization server", - dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)"ntpdate" }, + dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)VAR_NTPDATE }, { "Routed", "Set flags for routed (default: -q)", dmenuVarCheck, configRoutedFlags, NULL, "routed" }, { "Rwhod", "This machine wants to run the rwho daemon", @@ -1069,45 +1069,45 @@ close to you to have your system time syncronized accordingly.", "These are the primary open-access NTP servers", NULL, { { "Other", "Select a site not on this list", - NULL, configNTP }, + dmenuVarCheck, configNTP, NULL, NULL }, { "Australia", "ntp.syd.dms.csiro.au (HP 5061 Cesium Beam)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntp.syd.dms.csiro.au" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntp.syd.dms.csiro.au" }, { "Canada", "tick.usask.ca (GOES clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=tick.usask.ca" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=tick.usask.ca" }, { "France", "canon.inria.fr (TDF clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=canon.inria.fr" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=canon.inria.fr" }, { "Germany", "ntps1-{0,1,2}.uni-erlangen.de (GPS)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntps1-0.uni-erlangen.de" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.uni-erlangen.de" }, { "Germany #2", "ntps1-0.cs.tu-berlin.de (GPS)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntps1-0.cs.tu-berlin.de" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.cs.tu-berlin.de" }, { "Japan", "clock.nc.fukuoka-u.ac.jp (GPS clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clock.nc.fukuoka-u.ac.jp" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.nc.fukuoka-u.ac.jp" }, { "Japan #2", "clock.tl.fukuoka-u.ac.jp (GPS clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clock.tl.fukuoka-u.ac.jp" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.tl.fukuoka-u.ac.jp" }, { "Netherlands", "ntp0.nl.net (GPS clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntp0.nl.net" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntp0.nl.net" }, { "Norway", "timer.unik.no (NTP clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=timer.unik.no" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=timer.unik.no" }, { "Sweden", "Time1.Stupi.SE (Cesium/GPS)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=Time1.Stupi.SE" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=Time1.Stupi.SE" }, { "Switzerland", "swisstime.ethz.ch (DCF77 clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=swisstime.ethz.ch" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=swisstime.ethz.ch" }, { "U.S. East Coast", "bitsy.mit.edu (WWV clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=bitsy.mit.edu" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=bitsy.mit.edu" }, { "U.S. East Coast #2", "otc1.psu.edu (WWV clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=otc1.psu.edu" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=otc1.psu.edu" }, { "U.S. West Coast", "apple.com (WWV clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=apple.com" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=apple.com" }, { "U.S. West Coast #2", "clepsydra.dec.com (GOES clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clepsydra.dec.com" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clepsydra.dec.com" }, { "U.S. West Coast #3", "clock.llnl.gov (WWVB clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clock.llnl.gov" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.llnl.gov" }, { "U.S. Midwest", "ncar.ucar.edu (WWVB clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ncar.ucar.edu" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ncar.ucar.edu" }, { "U.S. Pacific", "chantry.hawaii.net (WWV/H clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=chantry.hawaii.net" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=chantry.hawaii.net" }, { "U.S. Southwest", "shorty.chpc.utexas.edu (WWV clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=shorty.chpc.utexas.edu" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=shorty.chpc.utexas.edu" }, { NULL } }, }; diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index 130f808..d4d7f80 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.h @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: sysinstall.h,v 1.68 1996/07/02 01:03:51 jkh Exp $ + * $Id: sysinstall.h,v 1.69 1996/07/02 10:57:56 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -116,7 +116,7 @@ #define VAR_NFS_SERVER "nfs_server" #define VAR_NO_CONFIRM "noConfirm" #define VAR_NOVELL "novell" -#define VAR_NTPDATE "ntpDate" +#define VAR_NTPDATE "ntpdate" #define VAR_PCNFSD "pcnfsd" #define VAR_PKG_TMPDIR "PKG_TMPDIR" #define VAR_PORTS_PATH "ports" diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 823857a..cba9514 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: config.c,v 1.41 1996/06/29 03:43:17 jkh Exp $ + * $Id: config.c,v 1.42 1996/07/02 09:12:34 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -339,13 +339,16 @@ configSaverTimeout(dialogMenuItem *self) int configNTP(dialogMenuItem *self) { - if (variable_get(VAR_NTPDATE)) { - variable_unset(VAR_NTPDATE); - return DITEM_SUCCESS | DITEM_REDRAW; + int status; + + status = variable_get_value(VAR_NTPDATE, "Enter the name of an NTP server") ? DITEM_SUCCESS : DITEM_FAILURE; + if (status == DITEM_SUCCESS) { + static char tmp[255]; + + snprintf(tmp, 255, "%s=%s", VAR_NTPDATE, variable_get(VAR_NTPDATE)); + self->aux = (int)tmp; } - else - return variable_get_value(VAR_NTPDATE, "Enter the name of an NTP server") - ? DITEM_SUCCESS : DITEM_FAILURE; + return status; } int diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 2a91fba..3031e3f 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.105 1996/07/02 01:03:42 jkh Exp $ + * $Id: install.c,v 1.106 1996/07/02 10:57:52 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -250,7 +250,7 @@ installFixitFloppy(dialogMenuItem *self) /* Link the spwd.db file */ if (DITEM_STATUS(Mkdir("/etc", NULL)) != DITEM_SUCCESS) msgConfirm("Unable to create an /etc directory! Things are weird on this floppy.."); - else if (symlink("/mnt2/etc/spwd.db", "/etc/spwd.db") == -1) + else if (symlink("/mnt2/etc/spwd.db", "/etc/spwd.db") == -1 && errno != EEXIST) msgConfirm("Couldn't symlink the /etc/spwd.db file! I'm not sure I like this.."); if (!file_readable(TERMCAP_FILE)) create_termcap(); diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index b8036b4..73026e2 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.77 1996/07/02 01:03:47 jkh Exp $ + * $Id: menus.c,v 1.78 1996/07/02 10:57:54 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -1039,10 +1039,10 @@ aspects of your system's network configuration.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" }, { "Gated", "This machine wants to run gated instead of routed", dmenuVarCheck, configGated, NULL, "gated" }, - { "Novell", "Install the Novell client/server demo package", + { "Netcon", "Install the Novell client/server demo package", dmenuVarCheck, configNovell, NULL, "novell" }, { "Ntpdate", "Select a clock-syncronization server", - dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)"ntpdate" }, + dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)VAR_NTPDATE }, { "Routed", "Set flags for routed (default: -q)", dmenuVarCheck, configRoutedFlags, NULL, "routed" }, { "Rwhod", "This machine wants to run the rwho daemon", @@ -1069,45 +1069,45 @@ close to you to have your system time syncronized accordingly.", "These are the primary open-access NTP servers", NULL, { { "Other", "Select a site not on this list", - NULL, configNTP }, + dmenuVarCheck, configNTP, NULL, NULL }, { "Australia", "ntp.syd.dms.csiro.au (HP 5061 Cesium Beam)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntp.syd.dms.csiro.au" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntp.syd.dms.csiro.au" }, { "Canada", "tick.usask.ca (GOES clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=tick.usask.ca" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=tick.usask.ca" }, { "France", "canon.inria.fr (TDF clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=canon.inria.fr" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=canon.inria.fr" }, { "Germany", "ntps1-{0,1,2}.uni-erlangen.de (GPS)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntps1-0.uni-erlangen.de" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.uni-erlangen.de" }, { "Germany #2", "ntps1-0.cs.tu-berlin.de (GPS)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntps1-0.cs.tu-berlin.de" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.cs.tu-berlin.de" }, { "Japan", "clock.nc.fukuoka-u.ac.jp (GPS clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clock.nc.fukuoka-u.ac.jp" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.nc.fukuoka-u.ac.jp" }, { "Japan #2", "clock.tl.fukuoka-u.ac.jp (GPS clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clock.tl.fukuoka-u.ac.jp" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.tl.fukuoka-u.ac.jp" }, { "Netherlands", "ntp0.nl.net (GPS clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntp0.nl.net" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntp0.nl.net" }, { "Norway", "timer.unik.no (NTP clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=timer.unik.no" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=timer.unik.no" }, { "Sweden", "Time1.Stupi.SE (Cesium/GPS)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=Time1.Stupi.SE" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=Time1.Stupi.SE" }, { "Switzerland", "swisstime.ethz.ch (DCF77 clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=swisstime.ethz.ch" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=swisstime.ethz.ch" }, { "U.S. East Coast", "bitsy.mit.edu (WWV clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=bitsy.mit.edu" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=bitsy.mit.edu" }, { "U.S. East Coast #2", "otc1.psu.edu (WWV clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=otc1.psu.edu" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=otc1.psu.edu" }, { "U.S. West Coast", "apple.com (WWV clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=apple.com" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=apple.com" }, { "U.S. West Coast #2", "clepsydra.dec.com (GOES clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clepsydra.dec.com" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clepsydra.dec.com" }, { "U.S. West Coast #3", "clock.llnl.gov (WWVB clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clock.llnl.gov" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.llnl.gov" }, { "U.S. Midwest", "ncar.ucar.edu (WWVB clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ncar.ucar.edu" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ncar.ucar.edu" }, { "U.S. Pacific", "chantry.hawaii.net (WWV/H clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=chantry.hawaii.net" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=chantry.hawaii.net" }, { "U.S. Southwest", "shorty.chpc.utexas.edu (WWV clock)", - dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=shorty.chpc.utexas.edu" }, + dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=shorty.chpc.utexas.edu" }, { NULL } }, }; diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index 130f808..d4d7f80 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: sysinstall.h,v 1.68 1996/07/02 01:03:51 jkh Exp $ + * $Id: sysinstall.h,v 1.69 1996/07/02 10:57:56 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -116,7 +116,7 @@ #define VAR_NFS_SERVER "nfs_server" #define VAR_NO_CONFIRM "noConfirm" #define VAR_NOVELL "novell" -#define VAR_NTPDATE "ntpDate" +#define VAR_NTPDATE "ntpdate" #define VAR_PCNFSD "pcnfsd" #define VAR_PKG_TMPDIR "PKG_TMPDIR" #define VAR_PORTS_PATH "ports" -- cgit v1.1