From 07c77d857a3917c4a07b497066e4e3be39d51a59 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Mon, 29 Apr 1996 18:06:08 +0000 Subject: [PATCH] Yikes - bogon crept into the NFS setup menu. --- release/sysinstall/config.c | 4 ++-- release/sysinstall/menus.c | 4 ++-- release/sysinstall/samba.c | 8 +++++--- usr.sbin/sade/config.c | 4 ++-- usr.sbin/sade/menus.c | 4 ++-- usr.sbin/sysinstall/config.c | 4 ++-- usr.sbin/sysinstall/menus.c | 4 ++-- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index f4841973dba4..d462636f66ec 100644 --- a/release/sysinstall/config.c +++ b/release/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.28 1996/04/28 20:53:52 jkh Exp $ + * $Id: config.c,v 1.29 1996/04/28 22:54:15 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -595,7 +595,7 @@ configNFSServer(dialogMenuItem *self) vsystem("echo '#' >> /etc/exports"); vsystem("echo '# You should replace these lines with your actual exported filesystems.' >> /etc/exports"); vsystem("echo >> /etc/exports"); - vsprintf(cmd, "%s /etc/exports", variable_get(VAR_EDITOR)); + sprintf(cmd, "%s /etc/exports", variable_get(VAR_EDITOR)); dialog_clear(); systemExecute(cmd); restorescr(w); diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index c823cc8b83b5..408dde2e145d 100644 --- a/release/sysinstall/menus.c +++ b/release/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.56 1996/04/28 03:27:15 jkh Exp $ + * $Id: menus.c,v 1.57 1996/04/28 22:54:21 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -937,7 +937,7 @@ software not provided in the base distributions.", }; DMenu MenuNetworking = { - DMENU_CHECKLIST_TYPE, + DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, "Network Services Menu", "You may have already configured one network device (and the other\n\ various hostname/gateway/name server parameters) in the process\n\ diff --git a/release/sysinstall/samba.c b/release/sysinstall/samba.c index cbd9c15c08fd..f2520f52183d 100644 --- a/release/sysinstall/samba.c +++ b/release/sysinstall/samba.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: samba.c,v 1.1 1996/04/28 01:07:26 jkh Exp $ + * $Id: samba.c,v 1.2 1996/04/28 03:27:25 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard & Coranth Gryphon. All rights reserved. @@ -37,7 +37,7 @@ #include "sysinstall.h" static DMenu MenuSamba = { - DMENU_CHECKLIST_TYPE, + DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, "Samba Services Menu", "This allows you to configure various aspects of your Samba server.", NULL, @@ -58,6 +58,7 @@ int configSamba(dialogMenuItem *self) { int i = DITEM_SUCCESS; + WINDOW *w = savescr(); if (!dmenuOpenSimple(&MenuSamba)) i = DITEM_FAILURE; @@ -150,6 +151,7 @@ configSamba(dialogMenuItem *self) } if (DITEM_STATUS(i) == DITEM_SUCCESS) variable_set2("samba", "YES"); - return i | DITEM_RESTORE | DITEM_RECREATE; + restorescr(w); + return i | DITEM_RECREATE; } diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index f4841973dba4..d462636f66ec 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.28 1996/04/28 20:53:52 jkh Exp $ + * $Id: config.c,v 1.29 1996/04/28 22:54:15 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -595,7 +595,7 @@ configNFSServer(dialogMenuItem *self) vsystem("echo '#' >> /etc/exports"); vsystem("echo '# You should replace these lines with your actual exported filesystems.' >> /etc/exports"); vsystem("echo >> /etc/exports"); - vsprintf(cmd, "%s /etc/exports", variable_get(VAR_EDITOR)); + sprintf(cmd, "%s /etc/exports", variable_get(VAR_EDITOR)); dialog_clear(); systemExecute(cmd); restorescr(w); diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index c823cc8b83b5..408dde2e145d 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.56 1996/04/28 03:27:15 jkh Exp $ + * $Id: menus.c,v 1.57 1996/04/28 22:54:21 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -937,7 +937,7 @@ software not provided in the base distributions.", }; DMenu MenuNetworking = { - DMENU_CHECKLIST_TYPE, + DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, "Network Services Menu", "You may have already configured one network device (and the other\n\ various hostname/gateway/name server parameters) in the process\n\ diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index f4841973dba4..d462636f66ec 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.28 1996/04/28 20:53:52 jkh Exp $ + * $Id: config.c,v 1.29 1996/04/28 22:54:15 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -595,7 +595,7 @@ configNFSServer(dialogMenuItem *self) vsystem("echo '#' >> /etc/exports"); vsystem("echo '# You should replace these lines with your actual exported filesystems.' >> /etc/exports"); vsystem("echo >> /etc/exports"); - vsprintf(cmd, "%s /etc/exports", variable_get(VAR_EDITOR)); + sprintf(cmd, "%s /etc/exports", variable_get(VAR_EDITOR)); dialog_clear(); systemExecute(cmd); restorescr(w); diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index c823cc8b83b5..408dde2e145d 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.56 1996/04/28 03:27:15 jkh Exp $ + * $Id: menus.c,v 1.57 1996/04/28 22:54:21 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -937,7 +937,7 @@ software not provided in the base distributions.", }; DMenu MenuNetworking = { - DMENU_CHECKLIST_TYPE, + DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, "Network Services Menu", "You may have already configured one network device (and the other\n\ various hostname/gateway/name server parameters) in the process\n\