From 7fe30b1a02c5e98ca7690f08a5609eee30b095d2 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Fri, 8 Feb 2002 15:38:32 +0000
Subject: [PATCH] Corrected some paths and permissions

---
 SETUP.sh          | 6 +++---
 mbsetup/m_farea.c | 2 +-
 mbtask/mbtask.c   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/SETUP.sh b/SETUP.sh
index 2dad0f0c..a9a82116 100644
--- a/SETUP.sh
+++ b/SETUP.sh
@@ -247,8 +247,8 @@ if [ "$OSTYPE" = "NetBSD" ]; then
     useradd -c "MBSE BBS Admin" -d $MHOME -g bbs -G wheel,dialer -m -s /usr/pkg/bin/bash mbse
 fi
 log "+" "[$?] Added user mbse"
-chmod 770 $MHOME
-log "+" "[$?] chmod 770 $MHOME"
+chmod 775 $MHOME
+log "+" "[$?] chmod 775 $MHOME"
 
 echo -n " writing '$MHOME/.profile'"
 cat << EOF >$MHOME/.profile
@@ -285,7 +285,7 @@ fi
 chown mbse.bbs $MHOME/home
 log "+" "[$?] chown mbse.bbs $MHOME/home"
 chmod 770 $MHOME/home
-log "+" "[$?] chmod 775 $MHOME/home"
+log "+" "[$?] chmod 770 $MHOME/home"
 if [ "$OSTYPE" = "Linux" ]; then
     useradd -c "MBSE BBS Login" -d $MHOME/home/bbs -g bbs -s $MHOME/bin/mbnewusr bbs
     log "+" "[$?] Added user bbs"
diff --git a/mbsetup/m_farea.c b/mbsetup/m_farea.c
index d02697f1..40986b8e 100644
--- a/mbsetup/m_farea.c
+++ b/mbsetup/m_farea.c
@@ -76,7 +76,7 @@ int CountFilearea(void)
 			area.FileFind  = TRUE;
 			sprintf(area.BbsGroup, "LOCAL");
 			sprintf(area.NewGroup, "LOCAL");
-			sprintf(area.Path, "%s/pub/local/common", CFG.ftp_base);
+			sprintf(area.Path, "%s/local/common", CFG.ftp_base);
 			fwrite(&area, sizeof(area), 1, fil);
 			fclose(fil);
 			chmod(ffile, 0640);
diff --git a/mbtask/mbtask.c b/mbtask/mbtask.c
index 0fe5d091..a209ad43 100644
--- a/mbtask/mbtask.c
+++ b/mbtask/mbtask.c
@@ -177,7 +177,7 @@ void load_maincfg(void)
                 /*
                  * Newfiles reports
                  */
-                sprintf(CFG.ftp_base, "%s/ftp", getenv("MBSE_ROOT"));
+                sprintf(CFG.ftp_base, "%s/ftp/pub", getenv("MBSE_ROOT"));
                 CFG.newdays = 30;
                 CFG.security.level = 20;
                 CFG.new_split = 27;
@@ -376,7 +376,7 @@ void load_maincfg(void)
                 sprintf(CFG.ftp_msg_login, "/welcome.msg");
                 sprintf(CFG.ftp_msg_cwd, ".message");
                 sprintf(CFG.ftp_msg_shutmsg, "/etc/nologin");
-                sprintf(CFG.ftp_upl_path, "%s/incoming", CFG.ftp_base);
+                sprintf(CFG.ftp_upl_path, "%s/ftp/incoming", getenv("MBSE_ROOT"));
                 sprintf(CFG.ftp_banner, "%s/etc/ftpbanner", getenv("MBSE_ROOT"));
                 sprintf(CFG.ftp_email, "sysop@%s", CFG.sysdomain);
                 sprintf(CFG.ftp_pth_filter, "^[-A-Za-z0-9_\\.]*$  ^\\.  ^-");