From 56d73bb085f38d742ab920283bc86502defd851c Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Fri, 10 Nov 1995 04:43:47 +0000
Subject: [PATCH] Tweaks to anon ftp setup. Submitted by:	coranth

---
 release/sysinstall/anonFTP.c  | 11 +++++++++--
 usr.sbin/sysinstall/anonFTP.c | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/release/sysinstall/anonFTP.c b/release/sysinstall/anonFTP.c
index 492a05f13c33..f38cd25cef5e 100644
--- a/release/sysinstall/anonFTP.c
+++ b/release/sysinstall/anonFTP.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: apache.c,v 1.11 1995/11/05 01:00:27 jkh Exp $
+ * $Id: anonFTP.c,v 1.1 1995/11/09 02:31:53 jkh Exp $
  *
  * Copyright (c) 1995
  *	Coranth Gryphon.  All rights reserved.
@@ -59,11 +59,12 @@
 /* This doesn't change until FTP itself changes */
 
 #define FTP_NAME	"ftp"
+#define MOTD_FILE	"ftpmotd"
 
 /* These change if we want to use different defaults */
 
 #define FTP_UID		14
-#define FTP_GID		6
+#define FTP_GID		5
 #define FTP_GROUP	"operator"
 #define FTP_UPLOAD	"incoming"
 #define FTP_COMMENT	"Anonymous FTP Admin"
@@ -481,6 +482,12 @@ configAnonFTP(char *unused)
       msgConfirm("Unable to create FTP user!  Anonymous FTP setup failed.");
       i = RET_FAIL;
      }
+
+    if (! msgYesNo("Create a welcome message file for anonymous FTP users?"))
+     {
+      vsystem("echo 'Your welcome message here.' > %s/etc/%s", tconf.homedir, MOTD_FILE);
+      vsystem("ee %s/etc/%s", tconf.homedir, MOTD_FILE);
+     }
    }
   else {
 	dialog_clear();
diff --git a/usr.sbin/sysinstall/anonFTP.c b/usr.sbin/sysinstall/anonFTP.c
index 492a05f13c33..f38cd25cef5e 100644
--- a/usr.sbin/sysinstall/anonFTP.c
+++ b/usr.sbin/sysinstall/anonFTP.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: apache.c,v 1.11 1995/11/05 01:00:27 jkh Exp $
+ * $Id: anonFTP.c,v 1.1 1995/11/09 02:31:53 jkh Exp $
  *
  * Copyright (c) 1995
  *	Coranth Gryphon.  All rights reserved.
@@ -59,11 +59,12 @@
 /* This doesn't change until FTP itself changes */
 
 #define FTP_NAME	"ftp"
+#define MOTD_FILE	"ftpmotd"
 
 /* These change if we want to use different defaults */
 
 #define FTP_UID		14
-#define FTP_GID		6
+#define FTP_GID		5
 #define FTP_GROUP	"operator"
 #define FTP_UPLOAD	"incoming"
 #define FTP_COMMENT	"Anonymous FTP Admin"
@@ -481,6 +482,12 @@ configAnonFTP(char *unused)
       msgConfirm("Unable to create FTP user!  Anonymous FTP setup failed.");
       i = RET_FAIL;
      }
+
+    if (! msgYesNo("Create a welcome message file for anonymous FTP users?"))
+     {
+      vsystem("echo 'Your welcome message here.' > %s/etc/%s", tconf.homedir, MOTD_FILE);
+      vsystem("ee %s/etc/%s", tconf.homedir, MOTD_FILE);
+     }
    }
   else {
 	dialog_clear();