From 5139198f3682c035d52ab432d6fe55336c847afb Mon Sep 17 00:00:00 2001 From: mhsin Date: Sat, 26 Apr 2008 11:23:21 +0000 Subject: Sync local mod. git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4249 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- innbbsd/Makefile | 8 +++++++- innbbsd/bbslib.c | 1 + innbbsd/bbslink.c | 10 +++++++++- innbbsd/bbsnnrp.c | 1 + innbbsd/connectsock.c | 1 + innbbsd/ctlinnbbsd.c | 1 + innbbsd/dbztool.c | 1 + innbbsd/echobbslib.c | 1 + innbbsd/his.c | 1 + innbbsd/innbbsd.c | 1 + innbbsd/inndchannel.c | 1 + innbbsd/inntobbs.c | 1 + innbbsd/mkhistory.c | 1 + innbbsd/nocem.c | 4 +++- innbbsd/pmain.c | 1 + innbbsd/receive_article.c | 9 ++++++++- 16 files changed, 39 insertions(+), 4 deletions(-) (limited to 'innbbsd') diff --git a/innbbsd/Makefile b/innbbsd/Makefile index bf1ae752..66d0741e 100644 --- a/innbbsd/Makefile +++ b/innbbsd/Makefile @@ -1,6 +1,6 @@ # $Id$ SRCROOT= .. -.include "$(SRCROOT)/pttbbs.mk" +.include "${SRCROOT}/pttbbs.mk" VERSION= 0.50-pttpatch ADMINUSER?= root@your.domain.name @@ -71,3 +71,9 @@ install: ${PROGS} clean: rm -f *.o ${PROGS} core *.core + +reset: + cd ../util/; ${MAKE} clean shmctl + ${MAKE} clean ; ${MAKE} ; ${MAKE} install + killall innbbsd + cd ~; nohup innd/innbbsd 7777 & diff --git a/innbbsd/bbslib.c b/innbbsd/bbslib.c index 326c7d87..80d37ec8 100644 --- a/innbbsd/bbslib.c +++ b/innbbsd/bbslib.c @@ -1,3 +1,4 @@ +#include "bbs.h" #include #if defined( LINUX ) #include "innbbsconf.h" diff --git a/innbbsd/bbslink.c b/innbbsd/bbslink.c index fde7af9e..b81469d9 100644 --- a/innbbsd/bbslink.c +++ b/innbbsd/bbslink.c @@ -874,8 +874,16 @@ post_article(node, site, sover, textline) if (!strstr(tcpmessage(), "Article not posted")&& !strstr(tcpmessage(), "435 Duplicate") && !strstr(tcpmessage(), "No valid newsgroups") && - (strncmp(tcpmessage(), " 437 ", 5) != 0)) + !strstr(tcpmessage(), "Article is empty") && + (strncmp(tcpmessage(), " 437 ", 5) != 0) /*&& + (strncmp(tcpmessage(), " 441 ", 5) != 0)*/) queuefeed(node, textline); + else + { + bbslog(" discarded\n"); + if(Verbose) + printf(" discarded\n"); + } return 0; } } else { diff --git a/innbbsd/bbsnnrp.c b/innbbsd/bbsnnrp.c index bee96899..41d06b87 100644 --- a/innbbsd/bbsnnrp.c +++ b/innbbsd/bbsnnrp.c @@ -10,6 +10,7 @@ * group each time) -t stdin|nntp (default=nntp) */ +#include "bbs.h" #include #include "innbbsconf.h" #include "osdep.h" diff --git a/innbbsd/connectsock.c b/innbbsd/connectsock.c index 5e526715..8d8cddad 100644 --- a/innbbsd/connectsock.c +++ b/innbbsd/connectsock.c @@ -1,3 +1,4 @@ +#include "bbs.h" #include #include "osdep.h" #include "innbbsconf.h" diff --git a/innbbsd/ctlinnbbsd.c b/innbbsd/ctlinnbbsd.c index 95e7d315..0c4a9356 100644 --- a/innbbsd/ctlinnbbsd.c +++ b/innbbsd/ctlinnbbsd.c @@ -1,3 +1,4 @@ +#include "bbs.h" #include #include "innbbsconf.h" #include "bbslib.h" diff --git a/innbbsd/dbztool.c b/innbbsd/dbztool.c index c2d77476..c519853a 100644 --- a/innbbsd/dbztool.c +++ b/innbbsd/dbztool.c @@ -1,3 +1,4 @@ +#include "bbs.h" #include #include #include diff --git a/innbbsd/echobbslib.c b/innbbsd/echobbslib.c index 0d34a443..ab417eff 100644 --- a/innbbsd/echobbslib.c +++ b/innbbsd/echobbslib.c @@ -1,3 +1,4 @@ +#include "bbs.h" #include #if defined( LINUX ) #include "innbbsconf.h" diff --git a/innbbsd/his.c b/innbbsd/his.c index 773fb78c..9aaa1373 100644 --- a/innbbsd/his.c +++ b/innbbsd/his.c @@ -3,6 +3,7 @@ * * History file routines. */ +#include "bbs.h" #include #include "innbbsconf.h" #include "bbslib.h" diff --git a/innbbsd/innbbsd.c b/innbbsd/innbbsd.c index f71ab30c..f43789d2 100644 --- a/innbbsd/innbbsd.c +++ b/innbbsd/innbbsd.c @@ -1,3 +1,4 @@ +#include "bbs.h" #include "innbbsconf.h" #include "daemon.h" #include "innbbsd.h" diff --git a/innbbsd/inndchannel.c b/innbbsd/inndchannel.c index fe5b74ef..7122ffe5 100644 --- a/innbbsd/inndchannel.c +++ b/innbbsd/inndchannel.c @@ -1,3 +1,4 @@ +#include "bbs.h" #include #include "innbbsconf.h" #include "daemon.h" diff --git a/innbbsd/inntobbs.c b/innbbsd/inntobbs.c index fca7c3d5..a83e29b1 100644 --- a/innbbsd/inntobbs.c +++ b/innbbsd/inntobbs.c @@ -1,3 +1,4 @@ +#include "bbs.h" #include #include #include "daemon.h" diff --git a/innbbsd/mkhistory.c b/innbbsd/mkhistory.c index c1278adb..565949ab 100644 --- a/innbbsd/mkhistory.c +++ b/innbbsd/mkhistory.c @@ -1,3 +1,4 @@ +#include "bbs.h" #include #include "externs.h" #include "innbbsconf.h" diff --git a/innbbsd/nocem.c b/innbbsd/nocem.c index 595ecb1d..52ac26d0 100644 --- a/innbbsd/nocem.c +++ b/innbbsd/nocem.c @@ -3,10 +3,12 @@ * NCMverify(), NCMcancel(): return 0 success, otherwise fail; */ +#include "bbs.h" #include #include "externs.h" #include "nocem.h" -#define PGP5 +//#define PGP5 +#undef PGP5 #undef PGP2 int ncmdebug = 0; diff --git a/innbbsd/pmain.c b/innbbsd/pmain.c index 1b039c48..d0f86484 100644 --- a/innbbsd/pmain.c +++ b/innbbsd/pmain.c @@ -1,3 +1,4 @@ +#include "bbs.h" #include "innbbsconf.h" #include "daemon.h" #include "externs.h" diff --git a/innbbsd/receive_article.c b/innbbsd/receive_article.c index 4ef00008..d0f02d7b 100644 --- a/innbbsd/receive_article.c +++ b/innbbsd/receive_article.c @@ -24,6 +24,7 @@ * cacnel_article_front(mid) --> cancel_article() --> bbspost_write_cancel(); */ +#include "bbs.h" #include "externs.h" #include #define _XOPEN_SOURCE /* glibc2 needs this */ @@ -280,11 +281,17 @@ receive_article() ".hkoo.net/", ".nowgo.net/", "http://www.taconet.com.tw/jscha/", "www.ejiajia.net", "ufjt0356@ms9.hinet.net", "jt0356@yahoo.com.tw", "http://www.IT-Test.Net", "http://uuu.to/", "greenhouse6688", - "http://www.s-bus.com", "http://goods.sytes.net/", + "http://www.s-bus.com", "http://goods.sytes.net/", ".uni.cc/", "http://www.1-care.com", "美商優莎納生技公司", "Http://www.It-Test.Net", "http://home.pchome.com.tw/happy/eykk6767/", "http://www.agelopp.com/", "http://www.togetrich.net", "http://www.newchance.ligsystem.com/", "jimtist@yahoo.com", "http://fleamarket.mine.nu", "http://e-car.mine.nu", + "漂亮美媚", "超 多 美 眉", "漂亮妹妹", "http://%6F", + ".mini.to/", "-------- ### --------", "babylove.24cc.cc", + "This is a multi-part message in MIME format.", + "OCAgIFNreXBlOmp1bnNreWVwCg==", "ooqq.bbs@bbs.wretch.cc", + "http://jsvcd.3cc.cc", "http://bestgirl.mytw.net", "http://98.to/", + "http://www.boss888.net", "amuro.bbs@bbs.csie.nctu.edu.tw", "http://www.whymsi.com", "http://www.msi-team.com/", NULL}; #endif -- cgit v1.2.3