Remove the registration stuff; we're redoing this and the emailed

registrations have a high failure rate for various reasons.

14 files changed, 14 insertions, 88 deletions

diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index 0be2955..e837479 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -13,7 +13,7 @@ SRCS=	anonFTP.c cdrom.c command.c config.c devices.c kget.c \
 	disks.c dispatch.c dist.c dmenu.c doc.c dos.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 mouse.c \
-	msg.c network.c nfs.c options.c package.c register.c system.c \
+	msg.c network.c nfs.c options.c package.c system.c \
 	tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
 	keymap.h
 
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index 74cd515..3ae09a1 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.123 1999/02/14 07:35:27 jkh Exp $
+ * $Id: config.c,v 1.124 1999/02/14 21:35:01 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -421,12 +421,6 @@ configSaverTimeout(dialogMenuItem *self)
 }
 
 int
-configRegister(dialogMenuItem *self)
-{
-    return DITEM_STATUS(registerOpenDialog()) | DITEM_RESTORE;
-}
-
-int
 configNTP(dialogMenuItem *self)
 {
     int status;
diff --git a/usr.sbin/sade/dispatch.c b/usr.sbin/sade/dispatch.c
index 8d289e4..7582b36 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.26 1998/11/15 09:06:19 jkh Exp $
+ * $Id: dispatch.c,v 1.27 1999/02/05 22:15:48 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -56,7 +56,6 @@ static struct _word {
     { "configNTP",		configNTP		},
     { "configPCNFSD",		configPCNFSD		},
     { "configPackages",		configPackages		},
-    { "configRegister",		configRegister		},
     { "configUsers",		configUsers		},
     { "configXEnvironment",	configXEnvironment	},
     { "diskPartitionEditor",	diskPartitionEditor	},
@@ -105,7 +104,6 @@ static struct _word {
     { "mediaGetType",		mediaGetType		},
     { "msgConfirm",		dispatch_msgConfirm	},
     { "optionsEditor",		optionsEditor		},
-    { "register",		configRegister		},	/* Alias */
     { "packageAdd",		packageAdd		},
     { "addGroup",		userAddGroup		},
     { "addUser",		userAddUser		},
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index f8a6d59..81d3ddc 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.229 1999/02/15 00:49:33 jkh Exp $
+ * $Id: install.c,v 1.230 1999/03/11 09:38:06 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -628,21 +628,6 @@ nodisks:
 	restorescr(w);
     }
 
-    dialog_clear_norefresh();
-    if (!msgYesNo("Would you like to register your FreeBSD system at this time?\n\n"
-		  "PLEASE, take just 5 minutes to do this.  If we're ever to get any\n"
-		  "significant base of commercial software for FreeBSD, we need to\n"
-		  "be able to provide more information about the size of our user community.\n"
-		  "This is where your registration can really help us, and you can also\n"
-		  "sign up for the new FreeBSD newsletter (its free!) at the same time.\n"))
-	configRegister(NULL);
-    else {
-	dialog_clear_norefresh();
-	msgConfirm("OK, but if you should change your mind then you always can register\n"
-		   "later by typing ``/stand/sysinstall register'' or by simply visiting our\n"
-		   "web site at http://www.freebsd.org/register.html");
-
-    }
     /* XXX Put whatever other nice configuration questions you'd like to ask the user here XXX */
 
     /* Give user the option of one last configuration spree */
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index d03b76d..5d7fb7a 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.193 1999/03/19 10:54:37 jkh Exp $
+ * $Id: menus.c,v 1.194 1999/04/21 07:22:37 obrien Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -281,7 +281,6 @@ DMenu MenuIndex = {
       { "Packages",		"The packages collection",		NULL, configPackages },
       { "Partition",		"The disk Slice (PC-style partition) Editor",	NULL, diskPartitionEditor },
       { "PCNFSD",		"Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
-      { "Register",		"Register yourself or company as a FreeBSD user.", dmenuVarCheck, configRegister, NULL, "registered" },
       { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
       { "Router",		"Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" },
       { "Syscons",		"The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
@@ -1167,7 +1166,6 @@ DMenu MenuConfigure = {
 	NULL, docBrowser },
       { "X XFree86",	"Configure XFree86",
 	NULL, configXEnvironment },
-      { "U Register",	"Register yourself or company as a FreeBSD user.", NULL, configRegister },
       { "E Exit",		"Exit this menu (returning to previous)",
 	NULL,	dmenuExit },
       { NULL } },
diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8
index c6e7fcb..054c5cb 100644
--- a/usr.sbin/sade/sade.8
+++ b/usr.sbin/sade/sade.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: sysinstall.8,v 1.15 1999/02/05 09:28:16 jkh Exp $
+.\"	$Id: sysinstall.8,v 1.16 1999/02/18 23:59:58 jkh Exp $
 .\"
 .Dd August 9, 1997
 .Dt SYSINSTALL 8
@@ -208,10 +208,6 @@ version).
 Bring up the interactive package management menu.
 .Pp
 \fBVariables:\fR None
-.It configRegister
-Register the user with the FreeBSD counter.
-.Pp
-\fBVariables:\fR None
 .It configUsers
 Add users and/or groups to the system.
 .Pp
@@ -740,10 +736,6 @@ Interactively get the user to specify some type of media.
 Invoke the interactive options editor.
 .Pp
 \fBVariables:\fR None
-.It register
-Bring up the FreeBSD registration form.
-.Pp
-\fBVariables:\fR None
 .It packageAdd
 Try to fetch and add a package to the system (requires
 that a media type be set),
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 8f171d1..bc7f673 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.159 1999/03/19 10:54:38 jkh Exp $
+ * $Id: sysinstall.h,v 1.160 1999/04/06 08:25:53 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -409,7 +409,6 @@ extern void	configEnvironmentResolv(char *config);
 extern void	configRC_conf(void);
 extern int	configFstab(dialogMenuItem *self);
 extern int	configRC(dialogMenuItem *self);
-extern int	configRegister(dialogMenuItem *self);
 extern int	configResolv(dialogMenuItem *self);
 extern int	configPackages(dialogMenuItem *self);
 extern int	configSaver(dialogMenuItem *self);
@@ -665,9 +664,6 @@ extern int	package_add(char *name);
 extern int	package_extract(Device *dev, char *name, Boolean depended);
 extern Boolean	package_exists(char *name);
 
-/* register.c */
-extern int	registerOpenDialog(void);
-
 /* system.c */
 extern void	systemInitialize(int argc, char **argv);
 extern void	systemShutdown(int status);
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index 0be2955..e837479 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -13,7 +13,7 @@ SRCS=	anonFTP.c cdrom.c command.c config.c devices.c kget.c \
 	disks.c dispatch.c dist.c dmenu.c doc.c dos.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 mouse.c \
-	msg.c network.c nfs.c options.c package.c register.c system.c \
+	msg.c network.c nfs.c options.c package.c system.c \
 	tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
 	keymap.h
 
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index 74cd515..3ae09a1 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.123 1999/02/14 07:35:27 jkh Exp $
+ * $Id: config.c,v 1.124 1999/02/14 21:35:01 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -421,12 +421,6 @@ configSaverTimeout(dialogMenuItem *self)
 }
 
 int
-configRegister(dialogMenuItem *self)
-{
-    return DITEM_STATUS(registerOpenDialog()) | DITEM_RESTORE;
-}
-
-int
 configNTP(dialogMenuItem *self)
 {
     int status;
diff --git a/usr.sbin/sysinstall/dispatch.c b/usr.sbin/sysinstall/dispatch.c
index 8d289e4..7582b36 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.26 1998/11/15 09:06:19 jkh Exp $
+ * $Id: dispatch.c,v 1.27 1999/02/05 22:15:48 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -56,7 +56,6 @@ static struct _word {
     { "configNTP",		configNTP		},
     { "configPCNFSD",		configPCNFSD		},
     { "configPackages",		configPackages		},
-    { "configRegister",		configRegister		},
     { "configUsers",		configUsers		},
     { "configXEnvironment",	configXEnvironment	},
     { "diskPartitionEditor",	diskPartitionEditor	},
@@ -105,7 +104,6 @@ static struct _word {
     { "mediaGetType",		mediaGetType		},
     { "msgConfirm",		dispatch_msgConfirm	},
     { "optionsEditor",		optionsEditor		},
-    { "register",		configRegister		},	/* Alias */
     { "packageAdd",		packageAdd		},
     { "addGroup",		userAddGroup		},
     { "addUser",		userAddUser		},
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index f8a6d59..81d3ddc 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.229 1999/02/15 00:49:33 jkh Exp $
+ * $Id: install.c,v 1.230 1999/03/11 09:38:06 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -628,21 +628,6 @@ nodisks:
 	restorescr(w);
     }
 
-    dialog_clear_norefresh();
-    if (!msgYesNo("Would you like to register your FreeBSD system at this time?\n\n"
-		  "PLEASE, take just 5 minutes to do this.  If we're ever to get any\n"
-		  "significant base of commercial software for FreeBSD, we need to\n"
-		  "be able to provide more information about the size of our user community.\n"
-		  "This is where your registration can really help us, and you can also\n"
-		  "sign up for the new FreeBSD newsletter (its free!) at the same time.\n"))
-	configRegister(NULL);
-    else {
-	dialog_clear_norefresh();
-	msgConfirm("OK, but if you should change your mind then you always can register\n"
-		   "later by typing ``/stand/sysinstall register'' or by simply visiting our\n"
-		   "web site at http://www.freebsd.org/register.html");
-
-    }
     /* XXX Put whatever other nice configuration questions you'd like to ask the user here XXX */
 
     /* Give user the option of one last configuration spree */
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index d03b76d..5d7fb7a 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.193 1999/03/19 10:54:37 jkh Exp $
+ * $Id: menus.c,v 1.194 1999/04/21 07:22:37 obrien Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -281,7 +281,6 @@ DMenu MenuIndex = {
       { "Packages",		"The packages collection",		NULL, configPackages },
       { "Partition",		"The disk Slice (PC-style partition) Editor",	NULL, diskPartitionEditor },
       { "PCNFSD",		"Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
-      { "Register",		"Register yourself or company as a FreeBSD user.", dmenuVarCheck, configRegister, NULL, "registered" },
       { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
       { "Router",		"Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" },
       { "Syscons",		"The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
@@ -1167,7 +1166,6 @@ DMenu MenuConfigure = {
 	NULL, docBrowser },
       { "X XFree86",	"Configure XFree86",
 	NULL, configXEnvironment },
-      { "U Register",	"Register yourself or company as a FreeBSD user.", NULL, configRegister },
       { "E Exit",		"Exit this menu (returning to previous)",
 	NULL,	dmenuExit },
       { NULL } },
diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8
index c6e7fcb..054c5cb 100644
--- a/usr.sbin/sysinstall/sysinstall.8
+++ b/usr.sbin/sysinstall/sysinstall.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: sysinstall.8,v 1.15 1999/02/05 09:28:16 jkh Exp $
+.\"	$Id: sysinstall.8,v 1.16 1999/02/18 23:59:58 jkh Exp $
 .\"
 .Dd August 9, 1997
 .Dt SYSINSTALL 8
@@ -208,10 +208,6 @@ version).
 Bring up the interactive package management menu.
 .Pp
 \fBVariables:\fR None
-.It configRegister
-Register the user with the FreeBSD counter.
-.Pp
-\fBVariables:\fR None
 .It configUsers
 Add users and/or groups to the system.
 .Pp
@@ -740,10 +736,6 @@ Interactively get the user to specify some type of media.
 Invoke the interactive options editor.
 .Pp
 \fBVariables:\fR None
-.It register
-Bring up the FreeBSD registration form.
-.Pp
-\fBVariables:\fR None
 .It packageAdd
 Try to fetch and add a package to the system (requires
 that a media type be set),
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 8f171d1..bc7f673 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.159 1999/03/19 10:54:38 jkh Exp $
+ * $Id: sysinstall.h,v 1.160 1999/04/06 08:25:53 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -409,7 +409,6 @@ extern void	configEnvironmentResolv(char *config);
 extern void	configRC_conf(void);
 extern int	configFstab(dialogMenuItem *self);
 extern int	configRC(dialogMenuItem *self);
-extern int	configRegister(dialogMenuItem *self);
 extern int	configResolv(dialogMenuItem *self);
 extern int	configPackages(dialogMenuItem *self);
 extern int	configSaver(dialogMenuItem *self);
@@ -665,9 +664,6 @@ extern int	package_add(char *name);
 extern int	package_extract(Device *dev, char *name, Boolean depended);
 extern Boolean	package_exists(char *name);
 
-/* register.c */
-extern int	registerOpenDialog(void);
-
 /* system.c */
 extern void	systemInitialize(int argc, char **argv);
 extern void	systemShutdown(int status);