Eliminate Samba configuration. Sorry, but this was another one of

those ideas that, like the Apache server setup, was well-intentioned
but doomed to fail in the face of change.  That and the fact that it
shouldn't be part of the installation tool, it should be part of the
post-installation setup tool (which we need to write).  Combining the
two utilities into one utility was my first conceptual mistake.

Apologies also to Coranth Gryphon, who worked hard on the Apache
and Samba server setup code.  These features were quite useful
for awhile, if that's any consolation, I just simply had the wrong
ideas about where to put them. :-(

11 files changed, 11 insertions, 42 deletions

diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index 773fc63..06470aa 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -11,7 +11,7 @@ SRCS=	anonFTP.c attr.c cdrom.c command.c config.c devices.c \
 	disks.c dispatch.c dist.c dmenu.c doc.c dos.c dosio.c floppy.c \
 	ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
 	label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
-	msg.c network.c nfs.c options.c package.c register.c samba.c system.c \
+	msg.c network.c nfs.c options.c package.c register.c system.c \
 	tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
 	uc_eisa.c uc_isa.c uc_kmem.c uc_list.c uc_main.c uc_pci.c \
 	uc_scsi.c keymap.h variable_load.c
diff --git a/usr.sbin/sade/dispatch.c b/usr.sbin/sade/dispatch.c
index 8251f9b..7905416 100644
--- a/usr.sbin/sade/dispatch.c
+++ b/usr.sbin/sade/dispatch.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dispatch.c,v 1.18 1997/06/21 15:45:08 jkh Exp $
+ * $Id: dispatch.c,v 1.19 1997/06/22 09:45:36 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -47,7 +47,6 @@ static struct _word {
     { "configAnonFTP",		configAnonFTP		},
     { "configRouter",		configRouter		},
     { "configNFSServer",	configNFSServer		},
-    { "configSamba",		configSamba		},
     { "configNTP",		configNTP		},
     { "configPCNFSD",		configPCNFSD		},
     { "configNFSServer",	configNFSServer		},
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 4ea6a3a..9aeafbc 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.190 1997/06/20 07:04:16 jkh Exp $
+ * $Id: install.c,v 1.191 1997/06/21 15:45:09 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -519,12 +519,6 @@ installNovice(dialogMenuItem *self)
     }
 
     dialog_clear_norefresh();
-    if (!msgYesNo("Would you like to configure Samba for connecting NETBUI clients to this\n"
-		  "machine?  Windows 95, Windows NT and Windows for Workgroups\n"
-		  "machines can use NETBUI transport for disk and printer sharing."))
-	configSamba(self);
-
-    dialog_clear_norefresh();
     if (!msgYesNo("Will this machine be an IP gateway (e.g. will it forward packets\n"
 		  "between interfaces)?"))
 	variable_set2("gateway", "YES");
@@ -994,7 +988,6 @@ installVarDefaults(dialogMenuItem *self)
     variable_set2(VAR_FTP_STATE,		"passive");
     variable_set2(VAR_NFS_SECURE,		"YES");
     variable_set2(VAR_PKG_TMPDIR,		"/usr/tmp");
-    variable_set2(VAR_SAMBA_PKG,		PACKAGE_SAMBA);
     variable_set2(VAR_GATED_PKG,		PACKAGE_GATED);
     variable_set2(VAR_PCNFSD_PKG,		PACKAGE_PCNFSD);
     variable_set2(VAR_MEDIA_TIMEOUT,		itoa(MEDIA_TIMEOUT));
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index c355bcf..f24b3a0 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.139 1997/06/13 14:21:20 jkh Exp $
+ * $Id: menus.c,v 1.140 1997/06/21 15:45:13 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -274,7 +274,6 @@ DMenu MenuIndex = {
       { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
       { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
       { "Router",		"Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" },
-      { "Samba",		"Configure Samba for LanManager access.", dmenuVarCheck, configSamba, NULL, "samba" },
       { "Syscons",		"The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
       { "Syscons, Font",	"The console screen font.",	  NULL, dmenuSubmenu, NULL, &MenuSysconsFont },
       { "Syscons, Keymap",	"The console keymap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
@@ -1152,8 +1151,6 @@ DMenu MenuNetworking = {
 	dmenuVarCheck,	dmenuToggleVariable, NULL, "rwhod_enable=YES" },
       { "Anon FTP",	"This machine wishes to allow anonymous FTP.",
 	dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" },
-      { "Samba",	"Install Samba for LanManager (NETBUI) access.",
-	dmenuVarCheck, configSamba, NULL, "samba" },
       { "PCNFSD",	"Run authentication server for clients with PC-NFS.",
 	dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
       { "Exit",		"Exit this menu (returning to previous)",
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 85d984d..11e6fc5 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.136 1997/06/21 15:45:15 jkh Exp $
+ * $Id: sysinstall.h,v 1.137 1997/06/22 09:45:40 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -58,7 +58,6 @@
 #define PACKAGE_GATED	"gated-3.5b3"
 #define PACKAGE_NETCON	"commerce/netcon/bsd61"
 #define PACKAGE_PCNFSD	"pcnfsd-93.02.16"
-#define PACKAGE_SAMBA	"samba-1.9.16p11"
 #define PACKAGE_LYNX	"lynx-2.7.1"
 
 /* device limits */
@@ -149,7 +148,6 @@
 #define VAR_ROUTER			"router"
 #define VAR_ROUTER_ENABLE		"router_enable"
 #define VAR_ROUTERFLAGS			"routerflags"
-#define VAR_SAMBA_PKG			"samba_pkg"
 #define VAR_SERIAL_SPEED		"serialSpeed"
 #define VAR_SLOW_ETHER			"slowEthernetCard"
 #define VAR_SWAP_SIZE			"swapSize"
@@ -427,7 +425,6 @@ extern int	configNTP(dialogMenuItem *self);
 extern int	configUsers(dialogMenuItem *self);
 extern int	configXEnvironment(dialogMenuItem *self);
 extern int	configRouter(dialogMenuItem *self);
-extern int	configSamba(dialogMenuItem *self);
 extern int	configPCNFSD(dialogMenuItem *self);
 extern int	configNFSServer(dialogMenuItem *self);
 extern int	configWriteRC_conf(dialogMenuItem *self);
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index 773fc63..06470aa 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -11,7 +11,7 @@ SRCS=	anonFTP.c attr.c cdrom.c command.c config.c devices.c \
 	disks.c dispatch.c dist.c dmenu.c doc.c dos.c dosio.c floppy.c \
 	ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
 	label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
-	msg.c network.c nfs.c options.c package.c register.c samba.c system.c \
+	msg.c network.c nfs.c options.c package.c register.c system.c \
 	tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
 	uc_eisa.c uc_isa.c uc_kmem.c uc_list.c uc_main.c uc_pci.c \
 	uc_scsi.c keymap.h variable_load.c
diff --git a/usr.sbin/sysinstall/dispatch.c b/usr.sbin/sysinstall/dispatch.c
index 8251f9b..7905416 100644
--- a/usr.sbin/sysinstall/dispatch.c
+++ b/usr.sbin/sysinstall/dispatch.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dispatch.c,v 1.18 1997/06/21 15:45:08 jkh Exp $
+ * $Id: dispatch.c,v 1.19 1997/06/22 09:45:36 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -47,7 +47,6 @@ static struct _word {
     { "configAnonFTP",		configAnonFTP		},
     { "configRouter",		configRouter		},
     { "configNFSServer",	configNFSServer		},
-    { "configSamba",		configSamba		},
     { "configNTP",		configNTP		},
     { "configPCNFSD",		configPCNFSD		},
     { "configNFSServer",	configNFSServer		},
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 4ea6a3a..9aeafbc 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.190 1997/06/20 07:04:16 jkh Exp $
+ * $Id: install.c,v 1.191 1997/06/21 15:45:09 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -519,12 +519,6 @@ installNovice(dialogMenuItem *self)
     }
 
     dialog_clear_norefresh();
-    if (!msgYesNo("Would you like to configure Samba for connecting NETBUI clients to this\n"
-		  "machine?  Windows 95, Windows NT and Windows for Workgroups\n"
-		  "machines can use NETBUI transport for disk and printer sharing."))
-	configSamba(self);
-
-    dialog_clear_norefresh();
     if (!msgYesNo("Will this machine be an IP gateway (e.g. will it forward packets\n"
 		  "between interfaces)?"))
 	variable_set2("gateway", "YES");
@@ -994,7 +988,6 @@ installVarDefaults(dialogMenuItem *self)
     variable_set2(VAR_FTP_STATE,		"passive");
     variable_set2(VAR_NFS_SECURE,		"YES");
     variable_set2(VAR_PKG_TMPDIR,		"/usr/tmp");
-    variable_set2(VAR_SAMBA_PKG,		PACKAGE_SAMBA);
     variable_set2(VAR_GATED_PKG,		PACKAGE_GATED);
     variable_set2(VAR_PCNFSD_PKG,		PACKAGE_PCNFSD);
     variable_set2(VAR_MEDIA_TIMEOUT,		itoa(MEDIA_TIMEOUT));
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index c355bcf..f24b3a0 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.139 1997/06/13 14:21:20 jkh Exp $
+ * $Id: menus.c,v 1.140 1997/06/21 15:45:13 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -274,7 +274,6 @@ DMenu MenuIndex = {
       { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
       { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
       { "Router",		"Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" },
-      { "Samba",		"Configure Samba for LanManager access.", dmenuVarCheck, configSamba, NULL, "samba" },
       { "Syscons",		"The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
       { "Syscons, Font",	"The console screen font.",	  NULL, dmenuSubmenu, NULL, &MenuSysconsFont },
       { "Syscons, Keymap",	"The console keymap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
@@ -1152,8 +1151,6 @@ DMenu MenuNetworking = {
 	dmenuVarCheck,	dmenuToggleVariable, NULL, "rwhod_enable=YES" },
       { "Anon FTP",	"This machine wishes to allow anonymous FTP.",
 	dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" },
-      { "Samba",	"Install Samba for LanManager (NETBUI) access.",
-	dmenuVarCheck, configSamba, NULL, "samba" },
       { "PCNFSD",	"Run authentication server for clients with PC-NFS.",
 	dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
       { "Exit",		"Exit this menu (returning to previous)",
diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c
index 3b81c95..b4b724d 100644
--- a/usr.sbin/sysinstall/options.c
+++ b/usr.sbin/sysinstall/options.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: options.c,v 1.54 1997/05/22 00:17:11 jkh Exp $
+ * $Id: options.c,v 1.55 1997/06/18 05:11:37 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -101,7 +101,6 @@ mediaCheck(Option opt)
 #define PKG_PROMPT	"Please specify a temporary directory with lots of free space:"
 #define INSTROOT_PROMPT	"Please specify a root directory if installing somewhere other than /"
 #define TIMEOUT_PROMPT	"Please specify the number of seconds to wait for slow media:"
-#define SAMBA_PKG_PROMPT "Please specify the package name for the Samba server:"
 #define GATED_PKG_PROMPT "Please specify the package name for the gated software:"
 #define PCNFSD_PKG_PROMPT "Please specify the package name for the PCNFSD server:"
 
@@ -138,8 +137,6 @@ static Option Options[] = {
       OPT_IS_VAR,	TIMEOUT_PROMPT,		VAR_MEDIA_TIMEOUT,	varCheck	},
 { "Package Temp",	"The directory where package temporary files should go",
       OPT_IS_VAR,	PKG_PROMPT,		VAR_PKG_TMPDIR,		varCheck	},
-{ "Samba package",	"The name of the Samba package to install if requested",
-      OPT_IS_VAR,	SAMBA_PKG_PROMPT,	VAR_SAMBA_PKG,		varCheck	},
 { "Gated package",	"The name of the gated package to install if requested",
       OPT_IS_VAR,	GATED_PKG_PROMPT,	VAR_GATED_PKG,		varCheck	},
 { "PCNFSD package",	"The name of the PCNFSD package to install if requested",
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 85d984d..11e6fc5 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.136 1997/06/21 15:45:15 jkh Exp $
+ * $Id: sysinstall.h,v 1.137 1997/06/22 09:45:40 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -58,7 +58,6 @@
 #define PACKAGE_GATED	"gated-3.5b3"
 #define PACKAGE_NETCON	"commerce/netcon/bsd61"
 #define PACKAGE_PCNFSD	"pcnfsd-93.02.16"
-#define PACKAGE_SAMBA	"samba-1.9.16p11"
 #define PACKAGE_LYNX	"lynx-2.7.1"
 
 /* device limits */
@@ -149,7 +148,6 @@
 #define VAR_ROUTER			"router"
 #define VAR_ROUTER_ENABLE		"router_enable"
 #define VAR_ROUTERFLAGS			"routerflags"
-#define VAR_SAMBA_PKG			"samba_pkg"
 #define VAR_SERIAL_SPEED		"serialSpeed"
 #define VAR_SLOW_ETHER			"slowEthernetCard"
 #define VAR_SWAP_SIZE			"swapSize"
@@ -427,7 +425,6 @@ extern int	configNTP(dialogMenuItem *self);
 extern int	configUsers(dialogMenuItem *self);
 extern int	configXEnvironment(dialogMenuItem *self);
 extern int	configRouter(dialogMenuItem *self);
-extern int	configSamba(dialogMenuItem *self);
 extern int	configPCNFSD(dialogMenuItem *self);
 extern int	configNFSServer(dialogMenuItem *self);
 extern int	configWriteRC_conf(dialogMenuItem *self);