Restore cvs

This commit is contained in:
Michiel Broek 2004-04-29 19:25:14 +00:00
parent 7b8b6ca9ca
commit 2b0a088da4
15 changed files with 193 additions and 249 deletions

View File

@ -35,6 +35,11 @@ v0.51.4 11-Apr-2004
Fixed a bug that no news was fetched at all. Fixed a bug that no news was fetched at all.
Fixed a bug that tossed echomail was attempted to post to the Fixed a bug that tossed echomail was attempted to post to the
ISP newsserver (that didn't accept it). ISP newsserver (that didn't accept it).
More debug logging info added for double filename announces.
mbfile:
The toberep command now logs the toberep.data in the debug
logfile.
mbnntp: mbnntp:
New program, news server to read echomail with a news client. New program, news server to read echomail with a news client.

View File

@ -103,7 +103,7 @@ chat.o: ../config.h ../lib/mbselib.h config.h chat.h ttyio.h
dial.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/nodelist.h ../lib/mbsedb.h config.h chat.h ttyio.h session.h dial.h dial.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/nodelist.h ../lib/mbsedb.h config.h chat.h ttyio.h session.h dial.h
dietifna.o: ../config.h ../lib/mbselib.h ../lib/nodelist.h ttyio.h session.h emsi.h dietifna.h respfreq.h filelist.h xmrecv.h xmsend.h dietifna.o: ../config.h ../lib/mbselib.h ../lib/nodelist.h ttyio.h session.h emsi.h dietifna.h respfreq.h filelist.h xmrecv.h xmsend.h
emsidat.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/nodelist.h ../lib/mbsedb.h emsi.h session.h lutil.h config.h emsidat.h filetime.h emsidat.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/nodelist.h ../lib/mbsedb.h emsi.h session.h lutil.h config.h emsidat.h filetime.h
filelist.o: ../config.h ../lib/mbselib.h ../lib/nodelist.h config.h session.h filelist.h filelist.o: ../config.h ../lib/mbselib.h ../lib/nodelist.h ../lib/users.h ../lib/mbsedb.h config.h session.h filelist.h
openfile.o: ../config.h ../lib/mbselib.h config.h lutil.h openfile.h openfile.o: ../config.h ../lib/mbselib.h config.h lutil.h openfile.h
openport.o: ../config.h ../lib/mbselib.h ulock.h ttyio.h mbcico.h openport.h openport.o: ../config.h ../lib/mbselib.h ulock.h ttyio.h mbcico.h openport.h
opentcp.o: ../config.h ../lib/mbselib.h ../lib/nodelist.h ../lib/users.h ../lib/mbsedb.h session.h ttyio.h openport.h opentcp.h opentcp.o: ../config.h ../lib/mbselib.h ../lib/nodelist.h ../lib/users.h ../lib/mbsedb.h session.h ttyio.h openport.h opentcp.h

View File

@ -457,7 +457,7 @@ SM_STATE(WaitAddr)
history.aka.net = remote->addr->net; history.aka.net = remote->addr->net;
history.aka.node = remote->addr->node; history.aka.node = remote->addr->node;
history.aka.point = remote->addr->point; history.aka.point = remote->addr->point;
sprintf(history.aka.domain, "%s", remote->addr->domain); sprintf(history.aka.domain, "%s", printable(remote->addr->domain, 0));
SM_PROCEED(SendPasswd) SM_PROCEED(SendPasswd)
} else if (bp.rxbuf[0] == MM_BSY) { } else if (bp.rxbuf[0] == MM_BSY) {
@ -756,7 +756,7 @@ SM_STATE(WaitAddr)
history.aka.net = remote->addr->net; history.aka.net = remote->addr->net;
history.aka.node = remote->addr->node; history.aka.node = remote->addr->node;
history.aka.point = remote->addr->point; history.aka.point = remote->addr->point;
sprintf(history.aka.domain, "%s", remote->addr->domain); sprintf(history.aka.domain, "%s", printable(remote->addr->domain, 0));
SM_PROCEED(IsPasswd) SM_PROCEED(IsPasswd)

View File

@ -149,7 +149,7 @@ int call(faddr *addr)
history.aka.node = addr->node; history.aka.node = addr->node;
history.aka.point = addr->point; history.aka.point = addr->point;
if (addr->domain && strlen(addr->domain)) if (addr->domain && strlen(addr->domain))
sprintf(history.aka.domain, "%s", addr->domain); sprintf(history.aka.domain, "%s", printable(addr->domain, 0));
/* /*
* Extract the protocol from the URL. * Extract the protocol from the URL.

View File

@ -396,7 +396,7 @@ int scanemsidat(char *buf)
history.aka.net = remote->addr->net; history.aka.net = remote->addr->net;
history.aka.node = remote->addr->node; history.aka.node = remote->addr->node;
history.aka.point = remote->addr->point; history.aka.point = remote->addr->point;
sprintf(history.aka.domain, "%s", remote->addr->domain); sprintf(history.aka.domain, "%s", printable(remote->addr->domain, 0));
} }
if (emsi_remote_password) if (emsi_remote_password)

View File

@ -31,6 +31,8 @@
#include "../config.h" #include "../config.h"
#include "../lib/mbselib.h" #include "../lib/mbselib.h"
#include "../lib/nodelist.h" #include "../lib/nodelist.h"
#include "../lib/users.h"
#include "../lib/mbsedb.h"
#include "config.h" #include "config.h"
#include "session.h" #include "session.h"
#include "filelist.h" #include "filelist.h"
@ -422,9 +424,9 @@ file_list *create_filelist(fa_list *al, char *fl, int create)
fa->point = strtol(digit, NULL, 32); fa->point = strtol(digit, NULL, 32);
for (tmpa = al; tmpa; tmpa = tmpa->next) { for (tmpa = al; tmpa; tmpa = tmpa->next) {
if ((fa->zone==tmpa->addr->zone) && (fa->net==tmpa->addr->net) && if ((fa->zone==tmpa->addr->zone) && (fa->net==tmpa->addr->net) &&
(fa->node==tmpa->addr->node) && (fa->point==tmpa->addr->point) && (fa->node==tmpa->addr->node) && (fa->point==tmpa->addr->point) && strchr(fl, flavor))
strchr(fl, flavor)) if (SearchFidonet(tmpa->addr->zone))
check_filebox(temp, &st); check_filebox(temp, &st);
} }
tidy_faddr(fa); tidy_faddr(fa);
} }
@ -458,8 +460,9 @@ file_list *create_filelist(fa_list *al, char *fl, int create)
for (tmpa = al; tmpa; tmpa = tmpa->next) { for (tmpa = al; tmpa; tmpa = tmpa->next) {
if ((fa->zone==tmpa->addr->zone) && (fa->net==tmpa->addr->net) && if ((fa->zone==tmpa->addr->zone) && (fa->net==tmpa->addr->net) &&
(fa->node==tmpa->addr->node) && (fa->point==tmpa->addr->point) && (fa->node==tmpa->addr->node) && (fa->point==tmpa->addr->point) &&
strchr(fl, flavor)) strchr(fl, flavor))
check_filebox(temp, &st); if (SearchFidonet(tmpa->addr->zone))
check_filebox(temp, &st);
} }
} }
tidy_faddr(fa); tidy_faddr(fa);

View File

@ -443,7 +443,7 @@ SM_STATE(scan_packet)
history.aka.node = remote->addr->node; history.aka.node = remote->addr->node;
history.aka.point = remote->addr->point; history.aka.point = remote->addr->point;
if (remote->addr->domain && strlen(remote->addr->domain)) if (remote->addr->domain && strlen(remote->addr->domain))
sprintf(history.aka.domain, "%s", remote->addr->domain); sprintf(history.aka.domain, "%s", printable(remote->addr->domain, 0));
if (((nlent=getnlent(remote->addr))) && (nlent->pflag != NL_DUMMY)) { if (((nlent=getnlent(remote->addr))) && (nlent->pflag != NL_DUMMY)) {
Syslog('+', "remote is a listed system"); Syslog('+', "remote is a listed system");

View File

@ -237,8 +237,8 @@ int outstat()
fa->point = strtol(digit, NULL, 32); fa->point = strtol(digit, NULL, 32);
if (SearchFidonet(fa->zone)) { if (SearchFidonet(fa->zone)) {
fa->domain = xstrcpy(fidonet.domain); fa->domain = xstrcpy(fidonet.domain);
checkdir(temp, fa, flavor);
} }
checkdir(temp, fa, flavor);
tidy_faddr(fa); tidy_faddr(fa);
} }
} }
@ -265,12 +265,12 @@ int outstat()
if ((n==4) || ((n==5) && (tolower(c)=='h'))) { if ((n==4) || ((n==5) && (tolower(c)=='h'))) {
if (SearchFidonet(fa->zone)) { if (SearchFidonet(fa->zone)) {
fa->domain = xstrcpy(fidonet.domain); fa->domain = xstrcpy(fidonet.domain);
} if (n==4)
if (n==4) flavor = 'o';
flavor = 'o'; else
else flavor = 'h';
flavor = 'h'; checkdir(temp, fa, flavor);
checkdir(temp, fa, flavor); }
} }
tidy_faddr(fa); tidy_faddr(fa);
} }

View File

@ -70,6 +70,8 @@ void ToBeRep(void)
while (fread(&rep, sizeof(rep), 1, fp) == 1) { while (fread(&rep, sizeof(rep), 1, fp) == 1) {
printf("%-20s %-12s %-12s %5ld %s %s\n", printf("%-20s %-12s %-12s %5ld %s %s\n",
rep.Echo, rep.Group, rep.Name, rep.SizeKb, StrDateDMY(rep.Fdate), rep.Announce ? "Yes":"No "); rep.Echo, rep.Group, rep.Name, rep.SizeKb, StrDateDMY(rep.Fdate), rep.Announce ? "Yes":"No ");
Syslog('f', "%-20s %-12s %-12s %5ld %s %s",
rep.Echo, rep.Group, rep.Name, rep.SizeKb, StrDateDMY(rep.Fdate), rep.Announce ? "Yes":"No ");
} }
fclose(fp); fclose(fp);

View File

@ -44,7 +44,7 @@ int Add_ToBeRep(struct _filerecord report)
char *fname; char *fname;
struct _filerecord Temp; struct _filerecord Temp;
FILE *tbr; FILE *tbr;
int Found = FALSE; int rc, Found = FALSE;
fname = calloc(PATH_MAX, sizeof(char)); fname = calloc(PATH_MAX, sizeof(char));
sprintf(fname, "%s/etc/toberep.data", getenv("MBSE_ROOT")); sprintf(fname, "%s/etc/toberep.data", getenv("MBSE_ROOT"));
@ -61,14 +61,17 @@ int Add_ToBeRep(struct _filerecord report)
if (strcmp(Temp.Name, report.Name) == 0) { if (strcmp(Temp.Name, report.Name) == 0) {
Syslog('f', "Add_ToBeRep found record with the same name"); Syslog('f', "Add_ToBeRep found record with the same name");
if (strlen(report.Echo) && (strcmp(Temp.Echo, report.Echo) == 0)) { if (strlen(report.Echo) && (strcmp(Temp.Echo, report.Echo) == 0)) {
Syslog('f', "Add_ToBeRep this is the same tic area"); Syslog('f', "Add_ToBeRep this is the same tic area !!!");
/* /*
* If it's a later received file, update the record * If it's a later received file, update the record
*/ */
if (report.Fdate > Temp.Fdate) { if (report.Fdate > Temp.Fdate) {
Syslog('f', "Add_ToBeRep this file is newer, update record at position %d", ftell(tbr)); Syslog('f', "Add_ToBeRep this file is newer, update record at position %d", ftell(tbr));
fseek(tbr, - sizeof(Temp), SEEK_CUR); rc = fseek(tbr, - sizeof(Temp), SEEK_CUR);
fwrite(&report, sizeof(report), 1, tbr); Syslog('f', "fseek rc=%d, size=%d", rc, sizeof(Temp));
Syslog('f', "Position before update is now %d", ftell(tbr));
rc = fwrite(&report, sizeof(report), 1, tbr);
Syslog('f', "Written %d, position after update is now %d", rc, ftell(tbr));
fclose(tbr); fclose(tbr);
return TRUE; return TRUE;
} }

View File

@ -1,236 +1,163 @@
# Top-level makefile for MBSE BBS package # Makefile for MBSE BBS under Linux
# Copyright (c) 1998, 2001 by M. Broek.
# $Id$ # $Id$
include Makefile.global include ../Makefile.global
OTHER = AUTHORS ChangeLog COPYING DEBUG CRON.sh FILE_ID.DIZ.in \ SRCS = signature.c filesub.c language.c mbtoberep.c \
INSTALL.in Makefile Makefile.global.in NEWS cpuflags \ msgutil.c oneline.c bbslist.c morefile.c \
ChangeLog_1998 ChangeLog_1999 ChangeLog_2000 ChangeLog_2001 \ email.c fsedit.c lineedit.c mblang.c mbuser.c page.c \
ChangeLog_2002 ChangeLog_2003 README SETUP.sh TODO UPGRADE \ bye.c funcs.c mail.c \
aclocal.m4 checkbasic config.h.in configure configure.in paths.h.in newuser.c pinfo.c timecheck.c change.c \
TARFILE = ${PACKAGE}-${VERSION}.tar.bz2 exitinfo.c mball.c mbsebbs.c menu.c pop3.c lastcallers.c \
timeout.c chat.c file.c mbstat.c misc.c \
offline.c user.c mbnewusr.c input.c whoson.c \
door.c dispfile.c userlist.c timestats.c logentry.c
HDRS = signature.h filesub.h language.h mbsebbs.h misc.h offline.h \
timeout.h bbslist.h email.h fsedit.h lineedit.h \
mbstat.h msgutil.h oneline.h user.h bye.h morefile.h \
funcs.h mail.h mbuser.h page.h \
change.h exitinfo.h mball.h newuser.h \
pinfo.h chat.h file.h menu.h \
pop3.h timecheck.h mbnewusr.h input.h whoson.h \
door.h dispfile.h userlist.h timestats.h logentry.h lastcallers.h
MBSEBBS_OBJS = signature.o bbslist.o chat.o file.o funcs.o mail.o menu.o \
misc.o pinfo.o oneline.o page.o fsedit.o \
bye.o change.o mbsebbs.o timeout.o user.o timecheck.o \
exitinfo.o filesub.o lineedit.o offline.o language.o msgutil.o \
pop3.o email.o input.o whoson.o door.o dispfile.o userlist.o timestats.o \
logentry.o morefile.o lastcallers.o
MBSEBBS_LIBS = ../lib/libmbse.a ../lib/libmsgbase.a ../lib/libdbase.a ../lib/libmbinet.a ../lib/libnodelist.a
MBNEWUSR_OBJS = mbnewusr.o newuser.o language.o timeout.o dispfile.o oneline.o \
timecheck.o input.o exitinfo.o funcs.o misc.o change.o door.o \
filesub.o mail.o email.o msgutil.o pop3.o lineedit.o fsedit.o whoson.o
MBNEWUSR_LIBS = ../lib/libmbse.a ../lib/libmsgbase.a ../lib/libdbase.a ../lib/libmbinet.a ../lib/libnodelist.a
MBALL_OBJS = mball.o
MBALL_LIBS = ../lib/libmbse.a ../lib/libdbase.a
MBLANG_OBJS = mblang.o
MBLANG_LIBS = ../lib/libmbse.a ../lib/libdbase.a
MBSTAT_OBJS = mbstat.o
MBSTAT_LIBS = ../lib/libmbse.a ../lib/libdbase.a
MBTOBE_OBJS = mbtoberep.o
MBTOBE_LIBS = ../lib/libmbse.a ../lib/libdbase.a
MBUSER_OBJS = mbuser.o
MBUSER_LIBS = ../lib/libmbse.a ../lib/libdbase.a
OTHER = Makefile
TARGET = mbsebbs mbnewusr mball mblang mbstat mbtoberep mbuser
############################################################################### #############################################################################################################
.c.o:
${CC} ${CFLAGS} ${INCLUDES} ${DEFINES} -c $<
all depend: all: ${TARGET}
@if [ -z ${MBSE_ROOT} ] ; then \
echo; echo " MBSE_ROOT is not set!"; echo; exit 3; \
else \
for d in ${SUBDIRS}; do (cd $$d && ${MAKE} $@) || exit; done; \
fi
help: clean:
@echo " Help for MBSE BBS make:" rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak
@echo ""
@echo "make [all] Compile all sources"
@echo "make install Install everything (must be root)"
@echo "make depend Update source dependencies"
@echo "make dist Create distribution archive"
@echo "make clean Clean sourcetree and configuration"
@echo "make crontab Install default crontab for mbse"
@echo "make filelist Create filelist for make dist"
@echo ""
install: mbsebbs: ${MBSEBBS_OBJS} ${MBSEBBS_LIBS}
@./checkbasic ${CC} -o mbsebbs ${MBSEBBS_OBJS} ${LDFLAGS} ${LIBS} ${MBSEBBS_LIBS}
mbnewusr: ${MBNEWUSR_OBJS} ${MBNEWUSR_LIBS}
${CC} -o mbnewusr ${MBNEWUSR_OBJS} ${LDFLAGS} ${LIBS} ${MBNEWUSR_LIBS}
mball: ${MBALL_OBJS} ${MBALL_LIBS}
${CC} -o mball ${MBALL_OBJS} ${LDFLAGS} ${LIBS} ${MBALL_LIBS}
mblang: ${MBLANG_OBJS} ${MBLANG_LIBS}
${CC} -o mblang ${MBLANG_OBJS} ${LDFLAGS} ${LIBS} ${MBLANG_LIBS}
mbstat: ${MBSTAT_OBJS} ${MBSTAT_LIBS}
${CC} -o mbstat ${MBSTAT_OBJS} ${LDFLAGS} ${LIBS} ${MBSTAT_LIBS}
mbtoberep: ${MBTOBE_OBJS} ${MBTOBE_LIBS}
${CC} -o mbtoberep ${MBTOBE_OBJS} ${LDFLAGS} ${LIBS} ${MBTOBE_LIBS}
mbuser: ${MBUSER_OBJS} ${MBUSER_LIBS}
${CC} -o mbuser ${MBUSER_OBJS} ${LDFLAGS} ${LIBS} ${MBUSER_LIBS}
install: all
@if [ "`id -un`" != "root" ] ; then \ @if [ "`id -un`" != "root" ] ; then \
echo; echo " Must be root to install!"; echo; exit 3; \ echo; echo " Must be root to install!"; echo; exit 3; \
fi fi
@if [ -z ${PREFIX} ] ; then \ ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbsebbs ${BINDIR}
echo; echo "PREFIX is not set!"; echo; exit 3; \ ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 6711 mbnewusr ${BINDIR}
fi ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mball ${BINDIR}
@if [ ! -d ${PREFIX}/bin ] ; then \ ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mblang ${BINDIR}
mkdir ${PREFIX}/bin ; \ ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbstat ${BINDIR}
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/bin ; \ ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbtoberep ${BINDIR}
fi ${INSTALL} -c -s -o ${ROWNER} -g ${RGROUP} -m 6711 mbuser ${BINDIR}
@if [ ! -d ${PREFIX}/etc ] ; then \ @rm -f mbchat
mkdir ${PREFIX}/etc ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/etc ; \
fi
@chmod 0775 ${PREFIX}/etc
@if [ -f ${PREFIX}/etc/lastcall.data ] ; then \
chmod 0660 ${PREFIX}/etc/lastcall.data ; \
fi
@if [ -f ${PREFIX}/etc/sysinfo.data ] ; then \
chmod 0660 ${PREFIX}/etc/sysinfo.data ; \
fi
@if [ ! -d ${PREFIX}/share ] ; then \
mkdir ${PREFIX}/share ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/share ; \
fi
@if [ ! -d ${PREFIX}/share/doc ] ; then \
mkdir ${PREFIX}/share/doc ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/share/doc ; \
fi
@if [ ! -d ${PREFIX}/fdb ] ; then \
mkdir ${PREFIX}/fdb ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/fdb ; \
fi
@chmod 0775 ${PREFIX}/fdb
@if [ ! -d ${PREFIX}/log ] ; then \
mkdir ${PREFIX}/log ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/log ; \
fi
@chmod 0775 ${PREFIX}/log
@if [ ! -d ${PREFIX}/magic ] ; then \
mkdir ${PREFIX}/magic ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/magic ; \
fi
@if [ ! -d ${PREFIX}/sema ] ; then \
mkdir ${PREFIX}/sema ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/sema ; \
fi
@chmod 0777 ${PREFIX}/sema
@if [ ! -d ${PREFIX}/var ] ; then \
mkdir ${PREFIX}/var ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/var ; \
fi
@if [ ! -d ${PREFIX}/tmp ] ; then \
mkdir ${PREFIX}/tmp ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/tmp ; \
fi
@chmod 0775 ${PREFIX}/tmp
@if [ ! -d ${PREFIX}/dutch ] ; then \
mkdir ${PREFIX}/dutch ; \
mkdir ${PREFIX}/dutch/txtfiles ; \
mkdir ${PREFIX}/dutch/menus ; \
mkdir ${PREFIX}/dutch/macro ; \
${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/dutch ; \
fi
@chmod 0775 ${PREFIX}/dutch/txtfiles
@if [ ! -d ${PREFIX}/english ] ; then \
mkdir ${PREFIX}/english ; \
mkdir ${PREFIX}/english/txtfiles ; \
mkdir ${PREFIX}/english/menus ; \
mkdir ${PREFIX}/english/macro ; \
${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/english ; \
fi
@chmod 0775 ${PREFIX}/english/txtfiles
@if [ ! -d ${PREFIX}/italian ] ; then \
mkdir ${PREFIX}/italian ; \
mkdir ${PREFIX}/italian/txtfiles ; \
mkdir ${PREFIX}/italian/menus ; \
mkdir ${PREFIX}/italian/macro ; \
${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/italian ; \
fi
@chmod 0775 ${PREFIX}/italian/txtfiles
@if [ ! -d ${PREFIX}/spanish ] ; then \
mkdir ${PREFIX}/spanish ; \
mkdir ${PREFIX}/spanish/txtfiles ; \
mkdir ${PREFIX}/spanish/menus ; \
mkdir ${PREFIX}/spanish/macro ; \
${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/spanish ; \
fi
@chmod 0775 ${PREFIX}/spanish/txtfiles
@if [ ! -d ${PREFIX}/galego ] ; then \
mkdir ${PREFIX}/galego ; \
mkdir ${PREFIX}/galego/txtfiles ; \
mkdir ${PREFIX}/galego/menus ; \
mkdir ${PREFIX}/galego/macro ; \
${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/galego ; \
fi
@chmod 0775 ${PREFIX}/galego/txtfiles
@if [ ! -d ${PREFIX}/german ] ; then \
mkdir ${PREFIX}/german; \
mkdir ${PREFIX}/german/txtfiles ; \
mkdir ${PREFIX}/german/menus ; \
mkdir ${PREFIX}/german/macro ; \
${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/german; \
fi
@chmod 0775 ${PREFIX}/german/txtfiles
@if [ ! -d ${PREFIX}/french ] ; then \
mkdir ${PREFIX}/french; \
mkdir ${PREFIX}/french/txtfiles ; \
mkdir ${PREFIX}/french/menus ; \
mkdir ${PREFIX}/french/macro ; \
${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/french; \
fi
@chmod 0775 ${PREFIX}/french/txtfiles
@if [ ! -d ${PREFIX}/ftp ] ; then \
mkdir ${PREFIX}/ftp ; \
mkdir ${PREFIX}/ftp/pub ; \
mkdir ${PREFIX}/ftp/incoming ; \
mkdir ${PREFIX}/ftp/pub/local ; \
${CHOWN} `id -un`:`id -gn` ${PREFIX}/ftp ; \
chmod 0755 ${PREFIX}/ftp ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/ftp/pub ; \
chmod 0755 ${PREFIX}/ftp/pub ; \
${CHOWN} `id -un`:`id -gn` ${PREFIX}/ftp/incoming ; \
chmod 0755 ${PREFIX}/ftp/incoming ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/ftp/pub/local ; \
chmod 0755 ${PREFIX}/ftp/pub/local ; \
fi
@if [ ! -d ${PREFIX}/var/bso ] ; then \
mkdir ${PREFIX}/var/nodelist ; \
mkdir ${PREFIX}/var/bso ; \
mkdir ${PREFIX}/var/bso/outbound ; \
mkdir ${PREFIX}/var/queue ; \
mkdir ${PREFIX}/var/msgs; \
mkdir ${PREFIX}/var/badtic ; \
mkdir ${PREFIX}/var/ticqueue ; \
mkdir ${PREFIX}/var/mail ; \
${CHOWN} -R ${OWNER}:${GROUP} ${PREFIX}/var ; \
chmod -R 0750 ${PREFIX}/var ; \
fi
@if [ ! -d ${PREFIX}/var/boxes ]; then \
mkdir ${PREFIX}/var/boxes ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/var/boxes ; \
chmod 0750 ${PREFIX}/var/boxes ; \
fi
@if [ ! -d ${PREFIX}/var/rules ]; then \
mkdir ${PREFIX}/var/rules ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/var/rules ; \
fi
@if [ ! -d ${PREFIX}/var/run ]; then \
mkdir ${PREFIX}/var/run ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/var/run ; \
fi
@if [ -d ${PREFIX}/var/inbound/tmp ]; then \
rmdir ${PREFIX}/var/inbound/tmp ; \
echo "Removed ${PREFIX}/var/inbound/tmp" ; \
fi
@chmod 0770 ${PREFIX}/var/rules
@chmod 0770 ${PREFIX}/var/run
@if [ ! -d ${PREFIX}/var/unknown ] ; then \
mkdir ${PREFIX}/var/unknown ; \
mkdir ${PREFIX}/var/inbound ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/var/unknown ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/var/inbound ; \
chmod 0750 ${PREFIX}/var/unknown ; \
chmod 0750 ${PREFIX}/var/inbound ; \
fi
@chmod 0770 ${PREFIX}/var
@chmod 0770 ${PREFIX}/var/mail
@if [ ! -d ${PREFIX}/var/arealists ] ; then \
mkdir ${PREFIX}/var/arealists ; \
${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/var/arealists ; \
chmod 0750 ${PREFIX}/var/arealists ; \
fi
@if [ -x ${BINDIR}/mbtelnetd ]; then \
rm ${BINDIR}/mbtelnetd ; \
echo "removed ${BINDIR}/mbtelnetd"; \
fi
@for d in ${SUBDIRS}; do (cd $$d && ${MAKE} -w $@) || exit; done
@if [ -d ${PREFIX}/doc ] ; then \
echo; echo "If there is nothing important in ${PREFIX}/doc" ; \
echo "you may remove that obsolete directory." ; \
fi
dist tar: ${TARFILE} filelist: Makefile
BASE=`pwd`; \
BASE=`basename $${BASE}`; \
(for f in ${SRCS} ${HDRS} ${OTHER} ; do echo ${PACKAGE}-${VERSION}/$${BASE}/$$f; done) >filelist
clean: depend:
rm -f .filelist core ${TARFILE} paths.h config.h @rm -f Makefile.bak; \
for d in ${SUBDIRS}; do (cd $$d && ${MAKE} $@) || exit; done; mv Makefile Makefile.bak; \
sed -e '/^# DO NOT DELETE/,$$d' Makefile.bak >Makefile; \
${TARFILE}: .filelist ${ECHO} '# DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT' \
cd ..; rm -f ${TARFILE}; \ >>Makefile; \
${TAR} cvTf ./${PACKAGE}-${VERSION}/.filelist - | bzip2 >${TARFILE} ${ECHO} '# Dependencies generated by make depend' >>Makefile; \
for f in ${SRCS}; \
crontab: do \
sh ./CRON.sh ${ECHO} "Dependencies for $$f:\c"; \
${ECHO} "`basename $$f .c`.o:\c" >>Makefile; \
.filelist filelist: for h in `sed -n -e \
(for f in ${OTHER} ;do echo ${PACKAGE}-${VERSION}/$$f; done) >.filelist 's/^#[ ]*include[ ]*"\([^"]*\)".*/\1/p' $$f`; \
for d in ${SUBDIRS}; do (cd $$d && ${MAKE} filelist && cat filelist >>../.filelist) || exit; done; do \
${ECHO} " $$h\c"; \
${ECHO} " $$h\c" >>Makefile; \
done; \
${ECHO} " done."; \
${ECHO} "" >>Makefile; \
done; \
${ECHO} '# End of generated dependencies' >>Makefile
# DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT
# Dependencies generated by make depend
signature.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h signature.h funcs.h input.h language.h timeout.h
filesub.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h filesub.h funcs.h language.h input.h misc.h timeout.h exitinfo.h change.h
language.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h language.h
mbtoberep.o: ../config.h ../lib/mbselib.h
msgutil.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msgtext.h ../lib/msg.h oneline.h msgutil.h
oneline.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h oneline.h funcs.h input.h language.h
bbslist.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h bbslist.h funcs.h input.h language.h
morefile.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h language.h morefile.h timeout.h
email.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msgtext.h ../lib/msg.h ../lib/mbinet.h exitinfo.h language.h mail.h timeout.h msgutil.h input.h email.h whoson.h
fsedit.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h mail.h input.h language.h timeout.h pinfo.h fsedit.h
lineedit.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h mail.h input.h language.h timeout.h lineedit.h
mblang.o: ../config.h ../lib/mbselib.h
mbuser.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/mbsedb.h mbuser.h
page.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h dispfile.h input.h chat.h page.h timeout.h mail.h language.h
bye.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/nodelist.h dispfile.h misc.h language.h bye.h
funcs.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msgtext.h ../lib/msg.h funcs.h
mail.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/nodelist.h ../lib/msgtext.h ../lib/msg.h mail.h funcs.h input.h language.h misc.h timeout.h oneline.h exitinfo.h lineedit.h fsedit.h filesub.h msgutil.h pop3.h email.h door.h whoson.h
newuser.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h funcs.h input.h newuser.h language.h timeout.h change.h dispfile.h
pinfo.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h pinfo.h input.h
timecheck.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h timecheck.h funcs.h bye.h exitinfo.h language.h input.h
change.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h change.h dispfile.h funcs.h input.h language.h misc.h timeout.h exitinfo.h bye.h
exitinfo.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h funcs.h input.h language.h oneline.h misc.h bye.h timeout.h timecheck.h exitinfo.h
mball.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbsedb.h mball.h
mbsebbs.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msg.h mbsebbs.h user.h dispfile.h language.h menu.h misc.h bye.h timeout.h funcs.h
menu.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h oneline.h mail.h bbslist.h change.h chat.h file.h funcs.h input.h misc.h timeout.h menu.h page.h pinfo.h bye.h timecheck.h whoson.h language.h offline.h email.h door.h dispfile.h userlist.h timestats.h logentry.h morefile.h lastcallers.h signature.h
pop3.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbinet.h ../lib/msgtext.h ../lib/msg.h msgutil.h pop3.h
lastcallers.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h language.h lastcallers.h
timeout.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msg.h timeout.h funcs.h bye.h filesub.h language.h
chat.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h chat.h funcs.h input.h language.h misc.h whoson.h
file.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h filesub.h file.h funcs.h input.h language.h misc.h timeout.h exitinfo.h whoson.h change.h dispfile.h
mbstat.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/mbsedb.h mbstat.h
misc.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h funcs.h input.h language.h misc.h timeout.h exitinfo.h
offline.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/bluewave.h ../lib/msgtext.h ../lib/msg.h mail.h funcs.h input.h language.h file.h filesub.h exitinfo.h timeout.h msgutil.h pop3.h offline.h whoson.h
user.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h timeout.h user.h dispfile.h funcs.h input.h misc.h bye.h file.h mail.h change.h menu.h exitinfo.h language.h offline.h email.h
mbnewusr.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h mbnewusr.h funcs.h input.h language.h misc.h timeout.h newuser.h
input.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h timeout.h language.h
whoson.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h language.h exitinfo.h whoson.h
door.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h language.h input.h timeout.h exitinfo.h whoson.h door.h
dispfile.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msgtext.h ../lib/msg.h funcs.h language.h oneline.h misc.h timeout.h timecheck.h exitinfo.h mail.h email.h input.h dispfile.h filesub.h
userlist.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h userlist.h language.h input.h timeout.h
timestats.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h timestats.h funcs.h language.h input.h exitinfo.h
logentry.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h logentry.h
# End of generated dependencies

View File

@ -834,6 +834,7 @@ void e_fidomailcfg(void)
errmsg("You have %d nodes defined", CountNoderec()); errmsg("You have %d nodes defined", CountNoderec());
show_int( 17,16, CFG.toss_systems); show_int( 17,16, CFG.toss_systems);
} else { } else {
Syslog('+', "Changing number of systems from %d to %d", CFG.toss_systems, temp);
CFG.toss_systems = temp; CFG.toss_systems = temp;
if ((OpenMsgarea() == 0)) if ((OpenMsgarea() == 0))
CloseMsgarea(TRUE); CloseMsgarea(TRUE);
@ -845,6 +846,7 @@ void e_fidomailcfg(void)
errmsg("You have %d groups defined", CountMGroup()); errmsg("You have %d groups defined", CountMGroup());
show_int( 18,16, CFG.toss_groups); show_int( 18,16, CFG.toss_groups);
} else { } else {
Syslog('+', "Changing number of groups from %d to %d", CFG.toss_groups, temp);
CFG.toss_groups = temp; CFG.toss_groups = temp;
if ((OpenNoderec() == 0)) if ((OpenNoderec() == 0))
CloseNoderec(TRUE); CloseNoderec(TRUE);

View File

@ -192,7 +192,6 @@ int OpenMsgarea(void)
start = SYSINFO.StartDate; start = SYSINFO.StartDate;
fclose(fin); fclose(fin);
} }
InitFidonet();
sprintf(fnin, "%s/etc/mareas.data", getenv("MBSE_ROOT")); sprintf(fnin, "%s/etc/mareas.data", getenv("MBSE_ROOT"));
sprintf(fnout, "%s/etc/mareas.temp", getenv("MBSE_ROOT")); sprintf(fnout, "%s/etc/mareas.temp", getenv("MBSE_ROOT"));

View File

@ -358,6 +358,7 @@ void initdatabases(void)
InitFilefind(); InitFilefind();
InitFGroup(); InitFGroup();
InitFidonetdb(); InitFidonetdb();
InitFidonet();
InitHatch(); InitHatch();
InitLanguage(); InitLanguage();
InitLimits(); InitLimits();

View File

@ -390,8 +390,8 @@ int outstat()
fa->point = strtol(digit, NULL, 32); fa->point = strtol(digit, NULL, 32);
if (SearchFidonet(fa->zone)) { if (SearchFidonet(fa->zone)) {
fa->domain = xstrcpy(fidonet.domain); fa->domain = xstrcpy(fidonet.domain);
checkdir(temp, fa, flavor);
} }
checkdir(temp, fa, flavor);
if (fa->domain) if (fa->domain)
free(fa->domain); free(fa->domain);
free(fa); free(fa);
@ -420,10 +420,12 @@ int outstat()
if ((n==4) || ((n==5) && (tolower(c)=='h'))) { if ((n==4) || ((n==5) && (tolower(c)=='h'))) {
if (SearchFidonet(fa->zone)) { if (SearchFidonet(fa->zone)) {
fa->domain = xstrcpy(fidonet.domain); fa->domain = xstrcpy(fidonet.domain);
if (n==4)
flavor = 'o';
else
flavor = 'h';
checkdir(temp, fa, flavor);
} }
if (n==4) flavor = 'o';
else flavor = 'h';
checkdir(temp, fa, flavor);
} }
if (fa->domain) if (fa->domain)
free(fa->domain); free(fa->domain);