INN commit: branches/2.5 (34 files)
INN Commit
rra at isc.org
Fri Jan 22 23:33:09 UTC 2010
Date: Friday, January 22, 2010 @ 15:33:08
Author: iulius
Revision: 8921
Update all INN code to use include/inn/nntp.h for NNTP codes and
eliminate include/nntp.h.
Modified:
branches/2.5/MANIFEST
branches/2.5/TODO
branches/2.5/authprogs/Makefile
branches/2.5/authprogs/radius.c
branches/2.5/backends/Makefile
branches/2.5/backends/innxbatch.c
branches/2.5/backends/innxmit.c
branches/2.5/backends/nntpget.c
branches/2.5/frontends/Makefile
branches/2.5/frontends/feedone.c
branches/2.5/frontends/inews.c
branches/2.5/frontends/rnews.c
branches/2.5/frontends/sys2nf.c
branches/2.5/include/inn/nntp.h
branches/2.5/innd/Makefile
branches/2.5/innd/innd.h
branches/2.5/innd/rc.c
branches/2.5/innfeed/Makefile
branches/2.5/innfeed/innlistener.c
branches/2.5/lib/Makefile
branches/2.5/lib/clientactive.c
branches/2.5/lib/clientlib.c
branches/2.5/lib/getmodaddr.c
branches/2.5/lib/localopen.c
branches/2.5/lib/remopen.c
branches/2.5/lib/sendarticle.c
branches/2.5/lib/sendpass.c
branches/2.5/nnrpd/Makefile
branches/2.5/nnrpd/article.c
branches/2.5/nnrpd/group.c
branches/2.5/nnrpd/newnews.c
branches/2.5/nnrpd/nnrpd.h
branches/2.5/nnrpd/perl.c
Deleted:
branches/2.5/include/nntp.h
-----------------------+
MANIFEST | 1
TODO | 3 -
authprogs/Makefile | 8 +--
authprogs/radius.c | 2
backends/Makefile | 11 ++---
backends/innxbatch.c | 2
backends/innxmit.c | 2
backends/nntpget.c | 2
frontends/Makefile | 7 +--
frontends/feedone.c | 4 -
frontends/inews.c | 2
frontends/rnews.c | 2
frontends/sys2nf.c | 2
include/inn/nntp.h | 6 ++
include/nntp.h | 41 ------------------
innd/Makefile | 81 ++++++++++++++++++-------------------
innd/innd.h | 2
innd/rc.c | 15 ++++--
innfeed/Makefile | 6 +-
innfeed/innlistener.c | 4 -
lib/Makefile | 19 +++-----
lib/clientactive.c | 9 ++--
lib/clientlib.c | 2
lib/getmodaddr.c | 13 +++---
lib/localopen.c | 2
lib/remopen.c | 4 -
lib/sendarticle.c | 2
lib/sendpass.c | 2
nnrpd/Makefile | 104 ++++++++++++++++++++++--------------------------
nnrpd/article.c | 9 +---
nnrpd/group.c | 3 -
nnrpd/newnews.c | 4 -
nnrpd/nnrpd.h | 2
nnrpd/perl.c | 3 -
34 files changed, 166 insertions(+), 215 deletions(-)
Modified: MANIFEST
===================================================================
--- MANIFEST 2010-01-22 23:32:22 UTC (rev 8920)
+++ MANIFEST 2010-01-22 23:33:08 UTC (rev 8921)
@@ -395,7 +395,6 @@
include/inn/vector.h Header file for vectors of strings
include/inn/wire.h Header file for wire-format functions
include/innperl.h Header file for embedded Perl
-include/nntp.h NNTP command and reply codes
include/portable Portability wrappers (Directory)
include/portable/alloca.h alloca replacement header
include/portable/getaddrinfo.h getaddrinfo replacement header
Modified: TODO
===================================================================
--- TODO 2010-01-22 23:32:22 UTC (rev 8920)
+++ TODO 2010-01-22 23:33:08 UTC (rev 8921)
@@ -232,9 +232,6 @@
include/inn/paths.h and look at adding anything needed by innfeed (and
eliminating the separate innfeed header serving the same purpose).
-* Update all INN code to use include/inn/nntp.h for NNTP codes and
- eliminate include/nntp.h.
-
* Use vectors or cvectors everywhere that argify and friends are currently
used and eliminate the separate implementation in nnrpd/misc.c.
Modified: authprogs/Makefile
===================================================================
--- authprogs/Makefile 2010-01-22 23:32:22 UTC (rev 8920)
+++ authprogs/Makefile 2010-01-22 23:33:08 UTC (rev 8921)
@@ -112,7 +112,7 @@
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/portable/time.h ../include/config.h \
../include/inn/innconf.h ../include/inn/defines.h ../include/inn/md5.h \
- ../include/inn/messages.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/conffile.h \
- libauth.h ../include/portable/socket.h \
- ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
+ ../include/inn/messages.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/conffile.h libauth.h \
+ ../include/portable/socket.h ../include/portable/getaddrinfo.h \
+ ../include/portable/getnameinfo.h
Modified: authprogs/radius.c
===================================================================
--- authprogs/radius.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ authprogs/radius.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -21,7 +21,7 @@
#include "inn/md5.h"
#include "inn/messages.h"
#include "inn/libinn.h"
-#include "nntp.h"
+#include "inn/nntp.h"
#include "inn/paths.h"
#include "conffile.h"
Modified: backends/Makefile
===================================================================
--- backends/Makefile 2010-01-22 23:32:22 UTC (rev 8920)
+++ backends/Makefile 2010-01-22 23:33:08 UTC (rev 8921)
@@ -182,8 +182,7 @@
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/portable/time.h ../include/inn/innconf.h \
../include/inn/defines.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h
+ ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h
innxmit.o: innxmit.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/portable/socket.h ../include/config.h \
@@ -191,8 +190,8 @@
../include/portable/time.h ../include/inn/history.h \
../include/inn/defines.h ../include/inn/innconf.h \
../include/inn/messages.h ../include/inn/qio.h ../include/inn/timer.h \
- ../include/inn/wire.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/wire.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h
map.o: map.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -207,8 +206,8 @@
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/portable/time.h ../include/inn/history.h \
../include/inn/defines.h ../include/inn/innconf.h \
- ../include/inn/messages.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h
+ ../include/inn/messages.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h
overchan.o: overchan.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/portable/time.h ../include/config.h \
Modified: backends/innxbatch.c
===================================================================
--- backends/innxbatch.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ backends/innxbatch.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -49,7 +49,7 @@
#include "inn/messages.h"
#include "inn/timer.h"
#include "inn/libinn.h"
-#include "nntp.h"
+#include "inn/nntp.h"
/*
** Global variables.
Modified: backends/innxmit.c
===================================================================
--- backends/innxmit.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ backends/innxmit.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -31,7 +31,7 @@
#include "inn/timer.h"
#include "inn/wire.h"
#include "inn/libinn.h"
-#include "nntp.h"
+#include "inn/nntp.h"
#include "inn/paths.h"
#include "inn/storage.h"
Modified: backends/nntpget.c
===================================================================
--- backends/nntpget.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ backends/nntpget.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -22,7 +22,7 @@
#include "inn/innconf.h"
#include "inn/messages.h"
#include "inn/libinn.h"
-#include "nntp.h"
+#include "inn/nntp.h"
#include "inn/paths.h"
/*
Modified: frontends/Makefile
===================================================================
--- frontends/Makefile 2010-01-22 23:32:22 UTC (rev 8920)
+++ frontends/Makefile 2010-01-22 23:33:08 UTC (rev 8921)
@@ -159,7 +159,7 @@
../include/inn/innconf.h ../include/inn/defines.h \
../include/inn/libinn.h ../include/inn/messages.h \
../include/inn/newsuser.h ../include/config.h ../include/clibrary.h \
- ../include/inn/paths.h ../include/nntp.h ../include/inn/nntp.h
+ ../include/inn/nntp.h ../include/inn/paths.h
innconfval.o: innconfval.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
@@ -207,9 +207,8 @@
../include/inn/innconf.h ../include/inn/defines.h \
../include/inn/libinn.h ../include/inn/messages.h \
../include/inn/newsuser.h ../include/config.h ../include/clibrary.h \
- ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.h ../include/inn/wire.h ../include/nntp.h \
- ../include/inn/nntp.h
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/wire.h
sm.o: sm.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/buffer.h ../include/inn/defines.h \
Modified: frontends/feedone.c
===================================================================
--- frontends/feedone.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ frontends/feedone.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -7,9 +7,9 @@
#include "clibrary.h"
#include <errno.h>
+#include "inn/libinn.h"
#include "inn/messages.h"
-#include "inn/libinn.h"
-#include "nntp.h"
+#include "inn/nntp.h"
static FILE *FromServer;
Modified: frontends/inews.c
===================================================================
--- frontends/inews.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ frontends/inews.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -17,8 +17,8 @@
#include "inn/libinn.h"
#include "inn/messages.h"
#include "inn/newsuser.h"
+#include "inn/nntp.h"
#include "inn/paths.h"
-#include "nntp.h"
/* Signature handling. The separator will be appended before the signature,
and at most SIG_MAXLINES will be appended. */
Modified: frontends/rnews.c
===================================================================
--- frontends/rnews.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ frontends/rnews.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -21,10 +21,10 @@
#include "inn/libinn.h"
#include "inn/messages.h"
#include "inn/newsuser.h"
+#include "inn/nntp.h"
#include "inn/paths.h"
#include "inn/storage.h"
#include "inn/wire.h"
-#include "nntp.h"
typedef struct _HEADER {
Modified: frontends/sys2nf.c
===================================================================
--- frontends/sys2nf.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ frontends/sys2nf.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -15,8 +15,8 @@
#include "inn/innconf.h"
#include "inn/libinn.h"
+#include "inn/nntp.h"
#include "inn/paths.h"
-#include "nntp.h"
#define TEMPFILE ":tmp"
static char **Groups;
Modified: include/inn/nntp.h
===================================================================
--- include/inn/nntp.h 2010-01-22 23:32:22 UTC (rev 8920)
+++ include/inn/nntp.h 2010-01-22 23:33:08 UTC (rev 8921)
@@ -42,6 +42,12 @@
** available for holding NNTP codes specifically.
*/
+#define NNTP_CLASS_INFO '1'
+#define NNTP_CLASS_OK '2'
+#define NNTP_CLASS_CONT '3'
+#define NNTP_CLASS_FAIL '4'
+#define NNTP_CLASS_ERR '5'
+
enum nntp_code {
NNTP_INFO_HELP = 100,
NNTP_INFO_CAPABILITIES = 101,
Deleted: include/nntp.h
===================================================================
--- include/nntp.h 2010-01-22 23:32:22 UTC (rev 8920)
+++ include/nntp.h 2010-01-22 23:33:08 UTC (rev 8921)
@@ -1,41 +0,0 @@
-/* $Id$
-**
-** Here be a set of NNTP response codes as defined in RFC3977 and elsewhere.
-** The reponse codes are three digits, RFI, defined like this:
-** R, Response:
-** 1xx Informative message
-** 2xx Command ok
-** 3xx Command ok so far, send the rest of it.
-** 4xx Command was correct, but couldn't be performed for
-** some reason.
-** 5xx Command unimplemented, or incorrect, or a serious
-** program error occurred.
-** F, Function:
-** x0x Connection, setup, and miscellaneous messages
-** x1x Newsgroup selection
-** x2x Article selection
-** x3x Distribution functions
-** x4x Posting
-** x8x Nonstandard extensions (AUTHINFO, XGTITLE)
-** x9x Debugging output
-** I, Information:
-** No defined semantics
-*/
-
-#include "inn/nntp.h"
-
-#define NNTP_ACCESS "502 Permission denied"
-#define NNTP_LIST_FOLLOWS "215"
-#define NNTP_ARTICLE_FOLLOWS "220"
-#define NNTP_REJECTIT_EMPTY "437 Empty article"
-#define NNTP_POSTEDOK "240 Article posted"
-#define NNTP_NOTINGROUP "412 Not in a newsgroup"
-#define NNTP_NOSUCHGROUP "411 No such group"
-#define NNTP_NEWNEWSOK "230 New news follows"
-
-/*
-** The first character of an NNTP reply can be used as a category class.
-*/
-#define NNTP_CLASS_OK '2'
-#define NNTP_CLASS_ERROR '4'
-#define NNTP_CLASS_FATAL '5'
Modified: innd/Makefile
===================================================================
--- innd/Makefile 2010-01-22 23:32:22 UTC (rev 8920)
+++ innd/Makefile 2010-01-22 23:33:08 UTC (rev 8921)
@@ -85,8 +85,8 @@
../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/inn/buffer.h \
../include/inn/history.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h
+ ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h
cc.o: cc.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
@@ -95,9 +95,9 @@
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h \
- ../include/inn/libinn.h ../include/nntp.h ../include/inn/nntp.h \
- ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.h ../include/inn/inndcomm.h ../include/innperl.h
+ ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h \
+ ../include/inn/storage.h ../include/inn/options.h \
+ ../include/inn/inndcomm.h ../include/innperl.h
chan.o: chan.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
@@ -106,9 +106,8 @@
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h \
- ../include/inn/libinn.h ../include/nntp.h ../include/inn/nntp.h \
- ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.h
+ ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h \
+ ../include/inn/storage.h ../include/inn/options.h
icd.o: icd.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/portable/mmap.h ../include/config.h \
@@ -117,10 +116,9 @@
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h \
- ../include/inn/libinn.h ../include/nntp.h ../include/inn/nntp.h \
- ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.h ../include/inn/ov.h ../include/inn/storage.h \
- ../include/inn/history.h
+ ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h \
+ ../include/inn/storage.h ../include/inn/options.h ../include/inn/ov.h \
+ ../include/inn/storage.h ../include/inn/history.h
innd.o: innd.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
@@ -130,9 +128,9 @@
../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/inn/buffer.h \
../include/inn/history.h ../include/inn/timer.h ../include/inn/libinn.h \
- ../include/nntp.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/ov.h ../include/inn/storage.h \
+ ../include/inn/history.h
keywords.o: keywords.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/libinn.h ../include/inn/defines.h \
@@ -140,8 +138,8 @@
../include/config.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/inn/buffer.h ../include/inn/history.h \
- ../include/inn/messages.h ../include/inn/timer.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/messages.h ../include/inn/timer.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h
lc.o: lc.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -150,8 +148,8 @@
../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/inn/buffer.h \
../include/inn/history.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h
nc.o: nc.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -161,8 +159,8 @@
../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/inn/buffer.h \
../include/inn/history.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h
newsfeeds.o: newsfeeds.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -171,8 +169,8 @@
../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/inn/buffer.h \
../include/inn/history.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h
ng.o: ng.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -181,8 +179,8 @@
../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/inn/buffer.h \
../include/inn/history.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h ../include/inn/ov.h ../include/inn/storage.h \
../include/inn/history.h
perl.o: perl.c ../include/config.h ../include/inn/defines.h \
@@ -192,8 +190,8 @@
../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/inn/buffer.h \
../include/inn/history.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h \
../include/ppport.h ../include/innperl.h
proc.o: proc.c ../include/config.h ../include/inn/defines.h \
@@ -203,8 +201,8 @@
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/inn/buffer.h ../include/inn/defines.h \
../include/inn/history.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h
python.o: python.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -214,9 +212,8 @@
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/inn/buffer.h ../include/inn/history.h \
../include/inn/messages.h ../include/inn/timer.h \
- ../include/inn/libinn.h ../include/nntp.h ../include/inn/nntp.h \
- ../include/inn/paths.h ../include/inn/storage.h \
- ../include/inn/options.h
+ ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h \
+ ../include/inn/storage.h ../include/inn/options.h
rc.o: rc.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/portable/socket.h ../include/config.h \
@@ -225,8 +222,8 @@
../include/inn/network.h ../include/inn/vector.h innd.h \
../include/portable/time.h ../include/inn/buffer.h \
../include/inn/history.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h
site.o: site.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -235,8 +232,8 @@
../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/inn/buffer.h \
../include/inn/history.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h
status.o: status.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -246,8 +243,8 @@
../include/inn/innconf.h ../include/inn/version.h innd.h \
../include/portable/time.h ../include/inn/buffer.h \
../include/inn/history.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h ../include/innperl.h
util.o: util.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -256,8 +253,8 @@
../include/config.h ../include/portable/socket.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/inn/buffer.h ../include/inn/history.h \
- ../include/inn/messages.h ../include/inn/timer.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/messages.h ../include/inn/timer.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h
wip.o: wip.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -266,8 +263,8 @@
../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/inn/buffer.h \
../include/inn/history.h ../include/inn/messages.h \
- ../include/inn/timer.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/timer.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h
tinyleaf.o: tinyleaf.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
Modified: innd/innd.h
===================================================================
--- innd/innd.h 2010-01-22 23:32:22 UTC (rev 8920)
+++ innd/innd.h 2010-01-22 23:33:08 UTC (rev 8921)
@@ -42,7 +42,7 @@
#include "inn/messages.h"
#include "inn/timer.h"
#include "inn/libinn.h"
-#include "nntp.h"
+#include "inn/nntp.h"
#include "inn/paths.h"
#include "inn/storage.h"
Modified: innd/rc.c
===================================================================
--- innd/rc.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ innd/rc.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -429,7 +429,7 @@
CHANNEL *new;
char *name;
long reject_val = 0;
- const char *reject_message;
+ char *reject_message;
int count;
int found;
time_t now;
@@ -514,12 +514,13 @@
}
if (remotecount == RemoteTotal) {
reject_val = NNTP_FAIL_TERMINATING;
- reject_message = "400 Server overloaded, try later";
+ xasprintf(&reject_message, "%d Server overloaded, try later",
+ NNTP_FAIL_TERMINATING);
}
else if (found >= RemoteLimit && !RCnolimit(&tempchan)) {
reject_val = NNTP_FAIL_TERMINATING;
- reject_message = "400 Connection rejected, you're making too"
- " many connects per minute";
+ xasprintf(&reject_message, "%d Connection rejected, you're making too"
+ " many connects per minute", NNTP_FAIL_TERMINATING);
}
else {
i = (remotefirst + remotecount) & (REMOTETABLESIZE - 1);
@@ -534,7 +535,7 @@
** Create a reject channel to reject the connection. This is done
** to avoid a call to fork.
*/
- if (reject_message) {
+ if (reject_message != NULL) {
new = CHANcreate(fd, CTreject, CSwritegoodbye, RCrejectreader,
RCrejectwritedone);
memcpy(&remotetable[i].Address, &remote,
@@ -544,6 +545,7 @@
WCHANset(new, reject_message, (int)strlen(reject_message));
WCHANappend(new, RCterm, strlen(RCterm));
WCHANadd(new);
+ free(reject_message);
return;
}
@@ -606,7 +608,7 @@
return;
} else {
reject_val = NNTP_ERR_ACCESS;
- reject_message = NNTP_ACCESS;
+ xasprintf(&reject_message, "%d Permission denied", NNTP_ERR_ACCESS);
new = CHANcreate(fd, CTreject, CSwritegoodbye, RCrejectreader,
RCrejectwritedone);
memcpy(&new->Address, &remote, sizeof(new->Address));
@@ -615,6 +617,7 @@
WCHANset(new, reject_message, (int)strlen(reject_message));
WCHANappend(new, RCterm, strlen(RCterm));
WCHANadd(new);
+ free(reject_message);
return;
}
Modified: innfeed/Makefile
===================================================================
--- innfeed/Makefile 2010-01-22 23:32:22 UTC (rev 8920)
+++ innfeed/Makefile 2010-01-22 23:33:08 UTC (rev 8921)
@@ -156,9 +156,9 @@
innlistener.o: innlistener.c innfeed.h ../include/inn/timer.h \
../include/inn/defines.h ../include/inn/system.h ../include/config.h \
../include/inn/defines.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/inn/messages.h ../include/inn/libinn.h \
- article.h misc.h buffer.h configfile.h endpoint.h host.h innlistener.h \
- ../include/nntp.h ../include/inn/nntp.h tape.h
+ ../include/config.h ../include/inn/libinn.h ../include/inn/messages.h \
+ ../include/inn/nntp.h article.h misc.h buffer.h configfile.h endpoint.h \
+ host.h innlistener.h tape.h
main.o: main.c innfeed.h ../include/inn/timer.h ../include/inn/defines.h \
../include/inn/system.h ../include/config.h ../include/inn/defines.h \
../include/inn/options.h ../include/clibrary.h ../include/config.h \
Modified: innfeed/innlistener.c
===================================================================
--- innfeed/innlistener.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ innfeed/innlistener.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -16,8 +16,9 @@
#include <syslog.h>
#include <time.h>
+#include "inn/libinn.h"
#include "inn/messages.h"
-#include "inn/libinn.h"
+#include "inn/nntp.h"
#include "article.h"
#include "buffer.h"
@@ -25,7 +26,6 @@
#include "endpoint.h"
#include "host.h"
#include "innlistener.h"
-#include "nntp.h"
#include "tape.h"
#define LISTENER_INPUT_BUFFER (1024 * 8) /* byte size of the input buffer */
Modified: lib/Makefile
===================================================================
--- lib/Makefile 2010-01-22 23:32:22 UTC (rev 8920)
+++ lib/Makefile 2010-01-22 23:33:08 UTC (rev 8921)
@@ -103,12 +103,11 @@
../include/inn/defines.h ../include/inn/system.h \
../include/inn/options.h ../include/clibrary.h ../include/config.h \
../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/libinn.h ../include/nntp.h ../include/inn/nntp.h \
- ../include/inn/paths.h
+ ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h
clientlib.o: clientlib.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/libinn.h ../include/nntp.h ../include/inn/nntp.h
+ ../include/inn/libinn.h ../include/inn/nntp.h
commands.o: commands.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/libinn.h ../include/inn/defines.h
@@ -159,8 +158,7 @@
getmodaddr.o: getmodaddr.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/libinn.h ../include/nntp.h ../include/inn/nntp.h \
- ../include/inn/paths.h
+ ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h
hash.o: hash.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/md5.h ../include/inn/defines.h \
@@ -193,8 +191,7 @@
localopen.o: localopen.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/libinn.h ../include/nntp.h ../include/inn/nntp.h \
- ../include/inn/paths.h
+ ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h
lockfile.o: lockfile.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/libinn.h ../include/inn/defines.h
@@ -255,8 +252,7 @@
../include/config.h ../include/portable/socket.h ../include/config.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/network.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h
+ ../include/inn/libinn.h ../include/inn/network.h ../include/inn/nntp.h
reservedfd.o: reservedfd.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/libinn.h ../include/inn/defines.h
@@ -266,12 +262,11 @@
sendarticle.o: sendarticle.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/libinn.h ../include/inn/defines.h \
- ../include/nntp.h ../include/inn/nntp.h
+ ../include/inn/nntp.h
sendpass.o: sendpass.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
- ../include/inn/libinn.h ../include/nntp.h ../include/inn/nntp.h \
- ../include/inn/paths.h
+ ../include/inn/libinn.h ../include/inn/nntp.h ../include/inn/paths.h
sequence.o: sequence.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/sequence.h ../include/inn/defines.h
Modified: lib/clientactive.c
===================================================================
--- lib/clientactive.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ lib/clientactive.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -8,7 +8,7 @@
#include "inn/innconf.h"
#include "inn/libinn.h"
-#include "nntp.h"
+#include "inn/nntp.h"
#include "inn/paths.h"
@@ -48,6 +48,7 @@
const char *request)
{
char buff[BUFSIZ];
+ char expectedanswer[BUFSIZ];
char *p;
int oerrno;
FILE *F;
@@ -56,16 +57,18 @@
if (F == NULL)
return NULL;
- /* Send a LIST command to and capture the output. */
+ /* Send a LIST command and capture the output. */
if (request == NULL)
fprintf(ToServer, "LIST\r\n");
else
fprintf(ToServer, "LIST %s\r\n", request);
fflush(ToServer);
+ snprintf(expectedanswer, sizeof(expectedanswer), "%d", NNTP_OK_LIST);
+
/* Get the server's reply to our command. */
if (fgets(buff, sizeof buff, FromServer) == NULL
- || strncmp(buff, NNTP_LIST_FOLLOWS, strlen(NNTP_LIST_FOLLOWS)) != 0) {
+ || strncmp(buff, expectedanswer, strlen(expectedanswer)) != 0) {
oerrno = errno;
/* Only call CAclose() if opened through CAopen(). */
if (strcmp(CApathname, pathname) == 0)
Modified: lib/clientlib.c
===================================================================
--- lib/clientlib.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ lib/clientlib.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -7,7 +7,7 @@
#include "inn/innconf.h"
#include "inn/libinn.h"
-#include "nntp.h"
+#include "inn/nntp.h"
FILE *ser_rd_fp = NULL;
Modified: lib/getmodaddr.c
===================================================================
--- lib/getmodaddr.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ lib/getmodaddr.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -8,7 +8,7 @@
#include "inn/innconf.h"
#include "inn/libinn.h"
-#include "nntp.h"
+#include "inn/nntp.h"
#include "inn/paths.h"
@@ -40,6 +40,7 @@
GMA_listopen(int fd, FILE *FromServer, FILE *ToServer, const char *request)
{
char buff[BUFSIZ];
+ char expectedanswer[BUFSIZ];
char *p;
int oerrno;
FILE *F;
@@ -50,14 +51,16 @@
/* Send a LIST command to and capture the output. */
if (request == NULL)
- fprintf(ToServer, "list moderators\r\n");
+ fprintf(ToServer, "LIST MODERATORS\r\n");
else
- fprintf(ToServer, "list %s\r\n", request);
+ fprintf(ToServer, "LIST %s\r\n", request);
fflush(ToServer);
+ snprintf(expectedanswer, sizeof(expectedanswer), "%d", NNTP_OK_LIST);
+
/* Get the server's reply to our command. */
if (fgets(buff, sizeof buff, FromServer) == NULL
- || strncmp(buff, NNTP_LIST_FOLLOWS, strlen(NNTP_LIST_FOLLOWS)) != 0) {
+ || strncmp(buff, expectedanswer, strlen(expectedanswer)) != 0) {
oerrno = errno;
fclose(F);
GMAclose();
@@ -121,7 +124,7 @@
GMApathname = concatpath(innconf->pathtmp, INN_PATH_TEMPMODERATORS);
fd = mkstemp(GMApathname);
if (fd >= 0)
- GMAfp = GMA_listopen(fd, FromServer, ToServer, "moderators");
+ GMAfp = GMA_listopen(fd, FromServer, ToServer, "MODERATORS");
else
GMAfp = NULL;
Modified: lib/localopen.c
===================================================================
--- lib/localopen.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ lib/localopen.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -9,7 +9,7 @@
#include "inn/innconf.h"
#include "inn/libinn.h"
-#include "nntp.h"
+#include "inn/nntp.h"
#include "inn/paths.h"
#ifdef HAVE_UNIX_DOMAIN_SOCKETS
Modified: lib/remopen.c
===================================================================
--- lib/remopen.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ lib/remopen.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -9,9 +9,9 @@
#include <errno.h>
#include "inn/innconf.h"
+#include "inn/libinn.h"
#include "inn/network.h"
-#include "inn/libinn.h"
-#include "nntp.h"
+#include "inn/nntp.h"
/*
Modified: lib/sendarticle.c
===================================================================
--- lib/sendarticle.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ lib/sendarticle.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -5,7 +5,7 @@
#include "config.h"
#include "clibrary.h"
#include "inn/libinn.h"
-#include "nntp.h"
+#include "inn/nntp.h"
/*
Modified: lib/sendpass.c
===================================================================
--- lib/sendpass.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ lib/sendpass.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -9,7 +9,7 @@
#include "inn/innconf.h"
#include "inn/libinn.h"
-#include "nntp.h"
+#include "inn/nntp.h"
#include "inn/paths.h"
Modified: nnrpd/Makefile
===================================================================
--- nnrpd/Makefile 2010-01-22 23:32:22 UTC (rev 8920)
+++ nnrpd/Makefile 2010-01-22 23:33:08 UTC (rev 8921)
@@ -82,10 +82,10 @@
../include/portable/socket.h ../include/config.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
- ../include/nntp.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h tls.h cache.h
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
+ ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
+ tls.h cache.h
auth-ext.o: auth-ext.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/portable/wait.h ../include/config.h \
@@ -93,8 +93,8 @@
../include/inn/messages.h ../include/inn/vector.h nnrpd.h \
../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/portable/time.h \
- ../include/inn/qio.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h ../include/inn/timer.h
cache.o: cache.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -107,20 +107,18 @@
nnrpd.h ../include/portable/socket.h ../include/config.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
- ../include/nntp.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
+ ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h
commands.o: commands.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/portable/wait.h ../include/config.h \
nnrpd.h ../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/portable/time.h \
../include/inn/qio.h ../include/inn/defines.h ../include/inn/libinn.h \
- ../include/nntp.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h \
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
+ ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
../include/inn/innconf.h ../include/inn/messages.h \
../include/inn/version.h tls.h
line.o: line.c ../include/config.h ../include/inn/defines.h \
@@ -129,19 +127,18 @@
nnrpd.h ../include/portable/socket.h ../include/config.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
- ../include/nntp.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/vector.h ../include/inn/timer.h tls.h
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
+ tls.h
list.o: list.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h nnrpd.h ../include/portable/socket.h \
../include/config.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/portable/time.h \
../include/inn/qio.h ../include/inn/defines.h ../include/inn/libinn.h \
- ../include/nntp.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h \
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
+ ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
../include/inn/innconf.h ../include/inn/messages.h
misc.o: misc.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -149,10 +146,10 @@
nnrpd.h ../include/portable/socket.h ../include/config.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
- ../include/nntp.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/vector.h ../include/inn/timer.h tls.h \
- ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
+ tls.h ../include/inn/ov.h ../include/inn/storage.h \
+ ../include/inn/history.h
newnews.o: newnews.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
@@ -160,10 +157,10 @@
../include/portable/socket.h ../include/config.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
- ../include/nntp.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h cache.h
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
+ ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
+ cache.h
nnrpd.o: nnrpd.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h \
../include/portable/alloca.h ../include/config.h ../include/clibrary.h \
@@ -176,18 +173,18 @@
../include/clibrary.h ../include/inn/ov.h ../include/inn/storage.h \
../include/inn/options.h ../include/inn/history.h \
../include/inn/version.h nnrpd.h ../include/portable/time.h \
- ../include/inn/qio.h ../include/nntp.h ../include/inn/nntp.h \
- ../include/inn/paths.h ../include/inn/storage.h ../include/inn/vector.h \
- ../include/inn/timer.h tls.h
+ ../include/inn/qio.h ../include/inn/nntp.h ../include/inn/paths.h \
+ ../include/inn/storage.h ../include/inn/vector.h ../include/inn/timer.h \
+ tls.h
perl.o: perl.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
nnrpd.h ../include/portable/socket.h ../include/config.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
- ../include/nntp.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/vector.h ../include/inn/timer.h post.h \
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
+ post.h \
../include/ppport.h \
../include/innperl.h
perm.o: perm.c ../include/config.h ../include/inn/defines.h \
@@ -197,8 +194,8 @@
../include/inn/innconf.h ../include/innperl.h nnrpd.h \
../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/portable/time.h \
- ../include/inn/qio.h ../include/inn/libinn.h ../include/nntp.h \
- ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/qio.h ../include/inn/libinn.h ../include/inn/nntp.h \
+ ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h
post.o: post.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
@@ -206,45 +203,42 @@
nnrpd.h ../include/portable/socket.h ../include/config.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
- ../include/nntp.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h post.h
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
+ ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
+ post.h
python.o: python.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
nnrpd.h ../include/portable/socket.h ../include/config.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
- ../include/nntp.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/vector.h ../include/inn/timer.h ../include/inn/hashtab.h
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
+ ../include/inn/hashtab.h
sasl.o: sasl.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/messages.h ../include/inn/defines.h \
nnrpd.h ../include/portable/socket.h ../include/config.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
- ../include/nntp.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
+ ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h
tls.o: tls.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h nnrpd.h ../include/portable/socket.h \
../include/config.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/portable/time.h \
../include/inn/qio.h ../include/inn/defines.h ../include/inn/libinn.h \
- ../include/nntp.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/vector.h ../include/inn/timer.h ../include/inn/innconf.h \
- tls.h
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h \
+ ../include/inn/innconf.h tls.h
track.o: track.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/inn/innconf.h ../include/inn/defines.h \
nnrpd.h ../include/portable/socket.h ../include/config.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
../include/portable/time.h ../include/inn/qio.h ../include/inn/libinn.h \
- ../include/nntp.h ../include/inn/nntp.h ../include/inn/paths.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/vector.h ../include/inn/timer.h
+ ../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/vector.h ../include/inn/timer.h
Modified: nnrpd/article.c
===================================================================
--- nnrpd/article.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ nnrpd/article.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -40,7 +40,6 @@
const char *Item;
} SENDDATA;
-static char ARTnotingroup[] = NNTP_NOTINGROUP;
static ARTHANDLE *ARThandle = NULL;
static SENDDATA SENDbody = {
STbody, NNTP_OK_BODY, "body"
@@ -683,7 +682,7 @@
/* Trying to read. */
if (GRPcount == 0) {
- Reply("%s\r\n", ARTnotingroup);
+ Reply("%d Not in a newsgroup\r\n", NNTP_FAIL_NO_GROUP);
return;
}
@@ -743,7 +742,7 @@
/* Trying to read. */
if (GRPcount == 0) {
- Reply("%s\r\n", ARTnotingroup);
+ Reply("%d Not in a newsgroup\r\n", NNTP_FAIL_NO_GROUP);
return;
}
if (ARTnumber < ARTlow || ARTnumber > ARThigh) {
@@ -944,7 +943,7 @@
/* Trying to read. */
if (GRPcount == 0) {
- Reply("%s\r\n", ARTnotingroup);
+ Reply("%d Not in a newsgroup\r\n", NNTP_FAIL_NO_GROUP);
return;
}
@@ -1230,7 +1229,7 @@
/* Trying to read. */
if (GRPcount == 0) {
- Reply("%s\r\n", ARTnotingroup);
+ Reply("%d Not in a newsgroup\r\n", NNTP_FAIL_NO_GROUP);
break;
}
Modified: nnrpd/group.c
===================================================================
--- nnrpd/group.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ nnrpd/group.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -18,7 +18,6 @@
void
CMDgroup(int ac, char *av[])
{
- static char NOSUCHGROUP[] = NNTP_NOSUCHGROUP;
ARTNUM i;
int low, high;
char *grplist[2];
@@ -62,7 +61,7 @@
/* FIXME: Temporarily work around broken API. */
if (!OVgroupstats(group, &low, &high, &count, NULL)) {
- Reply("%s %s\r\n", NOSUCHGROUP, group);
+ Reply("%d No such group %s\r\n", NNTP_FAIL_BAD_GROUP, group);
free(group);
return;
}
Modified: nnrpd/newnews.c
===================================================================
--- nnrpd/newnews.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ nnrpd/newnews.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -293,7 +293,7 @@
if (strcspn(av[1], "\\!*[?]") == strlen(av[1])) {
/* Optimise case -- don't need to scan the active file pattern
* matching. */
- Reply("%s\r\n", NNTP_NEWNEWSOK);
+ Reply("%d New news follows\r\n", NNTP_OK_NEWNEWS);
for (i = 0; groups[i]; ++i) {
process_newnews(groups[i], AllGroups, date);
}
@@ -313,7 +313,7 @@
}
free(path);
- Reply("%s\r\n", NNTP_NEWNEWSOK);
+ Reply("%d New news follows\r\n", NNTP_OK_NEWNEWS);
while ((p = QIOread(qp)) != NULL) {
for (q = p; *q != '\0'; q++) {
Modified: nnrpd/nnrpd.h
===================================================================
--- nnrpd/nnrpd.h 2010-01-22 23:32:22 UTC (rev 8920)
+++ nnrpd/nnrpd.h 2010-01-22 23:33:08 UTC (rev 8921)
@@ -15,7 +15,7 @@
#include "inn/qio.h"
#include "inn/libinn.h"
-#include "nntp.h"
+#include "inn/nntp.h"
#include "inn/paths.h"
#include "inn/storage.h"
#include "inn/vector.h"
Modified: nnrpd/perl.c
===================================================================
--- nnrpd/perl.c 2010-01-22 23:32:22 UTC (rev 8920)
+++ nnrpd/perl.c 2010-01-22 23:33:08 UTC (rev 8921)
@@ -18,11 +18,10 @@
#include "inn/innconf.h"
#include "nnrpd.h"
+#include "inn/nntp.h"
#include "inn/paths.h"
#include "post.h"
-#include "nntp.h"
-
/* Skip this entire file if DO_PERL (./configure --with-perl) isn't set. */
#ifdef DO_PERL
More information about the inn-committers
mailing list