From 48a59cf71a929dd971ea1be6ebcf5a21a18cbda4 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Sun, 2 Dec 2001 16:07:00 +0000
Subject: [PATCH] Improved SETUP.sh script

---
 ChangeLog         | 6 ++++++
 SETUP.sh          | 8 ++++----
 TODO              | 3 ---
 mbfido/makestat.c | 4 +---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 21a579ba..4f7b59ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4222,6 +4222,9 @@ v0.33.19        26-Oct-2001
 		the new style (not setuid) of mbsebbs.
 		Remove /opt/mbse/etc/maint to let it replace with a new
 		version, or change it by hand.
+		After compilation and installation run "mbfile check" to
+		update all file entries in the files database. This give a lot
+		of output in the logfile, don't worry about it.
 
 	general:
 		Made the Makefile system more simple. The bbs programs now
@@ -4231,6 +4234,9 @@ v0.33.19        26-Oct-2001
 		this may change by adding a login wrapper, for now this is how
 		it works now. Take it or leave it.
 
+	SETUP.sh
+		Better grep to check for excisting usernames like bbs, mbse.
+
 	lang:
 		Changed language prompts 6, 71, 429.
 		Added language prompts 472 and 473 for FS editor.
diff --git a/SETUP.sh b/SETUP.sh
index 0c7c7530..18cdd87c 100644
--- a/SETUP.sh
+++ b/SETUP.sh
@@ -134,14 +134,14 @@ if [ "$MBSE_ROOT" != "" ]; then
 	exit 2
 fi
 
-if [ "`grep mbse: /etc/passwd`" != "" ]; then
+if [ "`grep -w mbse: /etc/passwd`" != "" ]; then
 	echo "*** User 'mbse' already exists on this system ***"
 	echo "*** SETUP aborted ***"
 	log "!" "Aborted, user 'mbse' already exists on this system"
 	exit 2
 fi
 
-if [ "`grep bbs: /etc/group`" != "" ]; then
+if [ "`grep -w bbs: /etc/group`" != "" ]; then
 	echo "*** Group 'bbs' already exists on this system ***"
 	echo "*** SETUP aborted ***"
 	log "!" "Aborted, group 'bbs' already exists on this system"
@@ -300,7 +300,7 @@ if [ "$OSTYPE" = "Linux" ]; then
    if [ -f /etc/shadow ]; then
 	log "+" "Standard shadow password system"
 	# Not all systems are the same...
-	if [ "`grep bbs:\!\!: /etc/shadow`" != "" ]; then
+	if [ "`grep -w bbs:\!\!: /etc/shadow`" != "" ]; then
 		sed /bbs:\!\!:/s/bbs:\!\!:/bbs::/ /etc/shadow >/etc/shadow.bbs
 	else
 		sed /bbs:\!:/s/bbs:\!:/bbs::/ /etc/shadow >/etc/shadow.bbs
@@ -322,7 +322,7 @@ if [ "$OSTYPE" = "Linux" ]; then
 	echo " File /etc/shadow.mbse is your backup of /etc/shadow"
     else
 	log "+" "Not a shadow password system"
-        if [ "`grep bbs:\!\!: /etc/passwd`" != "" ]; then
+        if [ "`grep -w bbs:\!\!: /etc/passwd`" != "" ]; then
                 sed /bbs:\!\!:/s/bbs:\!\!:/bbs::/ /etc/passwd >/etc/passwd.bbs
         else
                 sed /bbs:\!:/s/bbs:\!:/bbs::/ /etc/passwd >/etc/passwd.bbs
diff --git a/TODO b/TODO
index d60d1210..e6a9c027 100644
--- a/TODO
+++ b/TODO
@@ -14,9 +14,6 @@ $Id$
                  L = Cosmetic or nice to have.
 
 
-SETUP.sh:
-	N: Better way to grep for excisting usernames and groupnames.
-
 mbsebbs:
 	L: Reading of function keys over modem lines, or worse PPP connections,
 	   must be fixed. Timing problems together with modem buffering?
diff --git a/mbfido/makestat.c b/mbfido/makestat.c
index 325a9d56..42438ba0 100644
--- a/mbfido/makestat.c
+++ b/mbfido/makestat.c
@@ -1,8 +1,7 @@
 /*****************************************************************************
  *
- * File ..................: mbfido/makestat.c
+ * $Id$
  * Purpose ...............: Make Web statistics
- * Last modification date : 08-Jun-2001
  *
  *****************************************************************************
  * Copyright (C) 1997-2001
@@ -418,7 +417,6 @@ void MakeStat(void)
 			fprintf(fw, "<TR><TH>ISDN calls</TH><TD align=right>%lu</TD></TR>\n", SYSINFO.ISDN);
 			fprintf(fw, "<TR><TH>Network calls</TH><TD align=right>%lu</TD></TR>\n", SYSINFO.Network);
 			fprintf(fw, "<TR><TH>Local calls</TH><TD align=right>%lu</TD></TR>\n", SYSINFO.Local);
-			fprintf(fw, "<TR><TH>ADSL calls</TH><TD align=right>%lu</TD></TR>\n", SYSINFO.ADSL);
 			fprintf(fw, "<TR><TH>Start date</TH><TD align=right>%s</TD></TR>\n", adate(SYSINFO.StartDate));
 			fprintf(fw, "<TR><TH>Last caller</TH><TD align=right>%s</TD></TR>\n", SYSINFO.LastCaller);
 			fprintf(fw, "</TABLE>\n");