Minor fixes, dropped some old distro support

This commit is contained in:
Michiel Broek 2004-02-02 20:27:46 +00:00
parent 3a2b52a619
commit a5998e7721
6 changed files with 17 additions and 41 deletions

View File

@ -9,6 +9,9 @@ v0.39.9 29-Jan-2004
inetd or xinetd configuration for itn (tfido) calls. inetd or xinetd configuration for itn (tfido) calls.
See the documentation of mbcico how to do this. See the documentation of mbcico how to do this.
libcommon.a:
Increased the sync() delay time for execute from 200 to 300 mS.
mbcico: mbcico:
Added telnet input and output filters so we can now call and Added telnet input and output filters so we can now call and
answer telnet (ITN) sessions. We don't need mbtelind anymore answer telnet (ITN) sessions. We don't need mbtelind anymore
@ -18,6 +21,9 @@ v0.39.9 29-Jan-2004
Clearing the working message is now only done by the keyboard Clearing the working message is now only done by the keyboard
read function. read function.
script:
Dropped support for RedHat and Mandrake pre 6.1.
v0.39.8 26-Jan-2004 - 29-Jan-2004 v0.39.8 26-Jan-2004 - 29-Jan-2004

4
configure vendored
View File

@ -9456,7 +9456,7 @@ echo "$as_me:$LINENO: result:
Configuration summary : Configuration summary :
Version : ..................... ${VERSION} Version : ..................... ${VERSION}
Hydra zlib compression : ...... ${ZLIBSUP} Hydra/Binkp zlib compression : ${ZLIBSUP}
" >&5 " >&5
echo "${ECHO_T} echo "${ECHO_T}
@ -9465,7 +9465,7 @@ echo "${ECHO_T}
Configuration summary : Configuration summary :
Version : ..................... ${VERSION} Version : ..................... ${VERSION}
Hydra zlib compression : ...... ${ZLIBSUP} Hydra/Binkp zlib compression : ${ZLIBSUP}
" >&6 " >&6

View File

@ -356,7 +356,7 @@ AC_MSG_RESULT([
Configuration summary : Configuration summary :
Version : ..................... ${VERSION} Version : ..................... ${VERSION}
Hydra zlib compression : ...... ${ZLIBSUP} Hydra/Binkp zlib compression : ${ZLIBSUP}
]) ])

View File

@ -140,12 +140,12 @@ int execute(char *cmd, char *file, char *pkt, char *in, char *out, char *err)
#ifdef __linux__ #ifdef __linux__
sync(); sync();
#endif #endif
msleep(200); msleep(300);
rc = _execute(cmd, file, pkt, in, out, err); rc = _execute(cmd, file, pkt, in, out, err);
#ifdef __linux__ #ifdef __linux__
sync(); sync();
#endif #endif
msleep(200); msleep(300);
return rc; return rc;
} }
@ -217,12 +217,12 @@ int execsh(char *cmd, char *in, char *out, char *err)
#ifdef __linux__ #ifdef __linux__
sync(); sync();
#endif #endif
msleep(200); msleep(300);
rc = _execsh(cmd, in, out, err); rc = _execsh(cmd, in, out, err);
#ifdef __linux__ #ifdef __linux__
sync(); sync();
#endif #endif
msleep(200); msleep(300);
return rc; return rc;
} }

View File

@ -32,38 +32,9 @@ fi
export MBSE_ROOT export MBSE_ROOT
SU="su"
#
# From RedHat version 6.1 and up the behaviour of "su" has changed.
# Extra tests are added for the RedHat e-smith server distribution,
# this is a special distribution based on RedHat.
# For Mandrake we follow the same behaviour.
#
if [ -f /etc/mandrake-release ]; then
#
# Mandrake 6.0 and newer, use "su -"
#
RHR="`cat /etc/mandrake-release | awk '{ print $4 }' | tr -d .`"
if [ $RHR -gt 60 ]; then
SU="su -"
fi
else
if [ -f /etc/redhat-release ]; then
if [ -z "`grep e-smith /etc/redhat-release`" ]; then
# Standard RedHat
RHR=`cat /etc/redhat-release | awk '{ print $5 }' | tr -d .`
else
# E-Smith server based on RedHat
RHR=`cat /etc/redhat-release | awk '{ print $13 }' | tr -d . | tr -d \)`
fi
if [ $RHR -gt 60 ]; then
SU="su -"
fi
fi
fi
# See how we were called. # See how we were called.
#
case "$1" in case "$1" in
start) start)
echo -n "Starting MBSE BBS: " echo -n "Starting MBSE BBS: "
@ -71,11 +42,11 @@ case "$1" in
rm -f ${MBSE_ROOT}/sema/* rm -f ${MBSE_ROOT}/sema/*
rm -f ${MBSE_ROOT}/var/*.LCK rm -f ${MBSE_ROOT}/var/*.LCK
rm -f ${MBSE_ROOT}/tmp/mb* rm -f ${MBSE_ROOT}/tmp/mb*
$SU mbse -c '${MBSE_ROOT}/bin/mbtask' >/dev/null su - mbse -c '${MBSE_ROOT}/bin/mbtask' >/dev/null
echo -n "mbtask " echo -n "mbtask "
sleep 2 sleep 2
if [ -f ${MBSE_ROOT}/etc/config.data ]; then if [ -f ${MBSE_ROOT}/etc/config.data ]; then
$SU mbse -c '${MBSE_ROOT}/bin/mbstat open -quiet' su - mbse -c '${MBSE_ROOT}/bin/mbstat open -quiet'
echo "opened" echo "opened"
fi fi
touch /var/lock/subsys/mbsed touch /var/lock/subsys/mbsed
@ -84,7 +55,7 @@ case "$1" in
echo -n "Shutting down MBSE BBS: " echo -n "Shutting down MBSE BBS: "
if [ -f ${MBSE_ROOT}/var/run/mbtask ]; then if [ -f ${MBSE_ROOT}/var/run/mbtask ]; then
echo -n "logoff users " echo -n "logoff users "
$SU mbse -c '${MBSE_ROOT}/bin/mbstat close wait -quiet' >/dev/null su - mbse -c '${MBSE_ROOT}/bin/mbstat close wait -quiet' >/dev/null
echo -n "done, " echo -n "done, "
echo -n "stop mbtask: " echo -n "stop mbtask: "
killproc mbtask -15 killproc mbtask -15

View File

@ -7,7 +7,6 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:${MBSE_ROOT}/bin
DISTNAME= DISTNAME=
DISTVERS= DISTVERS=
DISTINIT= DISTINIT=
SU="su"
OSTYPE=`uname -s` OSTYPE=`uname -s`
#------------------------------------------------------------------------ #------------------------------------------------------------------------