INN commit: trunk (19 files)
INN Commit
rra at isc.org
Sat Oct 30 09:44:47 UTC 2010
Date: Saturday, October 30, 2010 @ 02:44:46
Author: iulius
Revision: 9145
* Advertise the COUNTS, DISTRIBUTIONS, MODERATORS, MOTD and SUBSCRIPTIONS
keywords in the LIST capability for nnrpd. Compliance to RFC 6048.
* Implement the message of the day in innd, and advertise it in its LIST
capability.
* The motd.news file (previously used only by nnrpd) is renamed to motd.nnrpd
during innupgrade.
* A new motd.innd file is created for innd.
* In the 501 error code for an unexpected third argument to a LIST command,
mention it is not necessarily a wildmat.
* Better wording for the 503 error code in response to LIST.
* Documentation update.
* Symbolic links are created for motd.innd.5 and motd.nnrpd.5 (pointing
to the legacy motd.news.5 man page).
Added:
trunk/samples/motd.innd
trunk/samples/motd.nnrpd
(from rev 9112, trunk/samples/motd.news)
Modified:
trunk/MANIFEST
trunk/doc/man/Makefile
trunk/doc/pod/motd.news.pod
trunk/doc/pod/news.pod
trunk/include/inn/paths.h.in
trunk/innd/nc.c
trunk/nnrpd/list.c
trunk/nnrpd/nnrpd.c
trunk/perl/INN/Config.pm.in
trunk/scripts/innshellvars.in
trunk/scripts/innshellvars.pl.in
trunk/scripts/innshellvars.tcl.in
trunk/scripts/innupgrade.in
trunk/site/ (properties)
trunk/site/Makefile
trunk/support/mkmanifest
Deleted:
trunk/samples/motd.news
-----------------------------+
MANIFEST | 5 ++--
doc/man/Makefile | 3 ++
doc/pod/motd.news.pod | 20 +++++++++++--------
doc/pod/news.pod | 14 +++++++++++++
include/inn/paths.h.in | 3 +-
innd/nc.c | 43 +++++++++++++++++++++++++++++++++++++-----
nnrpd/list.c | 33 ++++++++++++++++----------------
nnrpd/nnrpd.c | 3 +-
perl/INN/Config.pm.in | 7 ++++--
samples/motd.innd | 5 ++++
samples/motd.news | 4 ---
samples/motd.nnrpd | 5 ++++
scripts/innshellvars.in | 4 ++-
scripts/innshellvars.pl.in | 4 ++-
scripts/innshellvars.tcl.in | 4 ++-
scripts/innupgrade.in | 6 ++++-
site/Makefile | 13 +++++++-----
support/mkmanifest | 3 +-
18 files changed, 130 insertions(+), 49 deletions(-)
Modified: MANIFEST
===================================================================
--- MANIFEST 2010-10-29 22:39:50 UTC (rev 9144)
+++ MANIFEST 2010-10-30 09:44:46 UTC (rev 9145)
@@ -178,7 +178,7 @@
doc/man/makehistory.8 Manpage for makehistory
doc/man/mod-active.8 Manpage for mod-active
doc/man/moderators.5 Manpage for moderators config file
-doc/man/motd.news.5 Manpage for motd.news config file
+doc/man/motd.news.5 Manpage for MOTD config files
doc/man/news.daily.8 Manpage for news.daily
doc/man/news2mail.8 Manpage for news2mail
doc/man/newsfeeds.5 Manpage for newsfeeds config file
@@ -627,7 +627,8 @@
samples/innwatch.ctl INN monitoring configuration
samples/localgroups Local newsgroups with descriptions
samples/moderators Moderation submission addresses
-samples/motd.news Sample MOTD file
+samples/motd.innd Sample MOTD file for innd
+samples/motd.nnrpd Sample MOTD file for nnrpd
samples/news2mail.cf news2mail config file
samples/newsfeeds.in innd feed configuration
samples/newsgroups.minimal Minimal starting newsgroups file
Modified: doc/man/Makefile
===================================================================
--- doc/man/Makefile 2010-10-29 22:39:50 UTC (rev 9144)
+++ doc/man/Makefile 2010-10-30 09:44:46 UTC (rev 9145)
@@ -59,6 +59,9 @@
for M in $(SEC5) ; do \
$(CP_MAN) $$M $D$(MAN5)/$$M ; \
done
+ rm -f $D$(MAN5)/motd.innd.5 $D$(MAN5)/motd.nnrpd.5
+ $(LN_S) motd.news.5 $D$(MAN5)/motd.innd.5
+ $(LN_S) motd.news.5 $D$(MAN5)/motd.nnrpd.5
rm -f $D$(MAN5)/localgroups.5 $D$(MAN5)/nocem.ctl.5
$(LN_S) $(MAN8)/docheckgroups.8 $D$(MAN5)/localgroups.5
$(LN_S) $(MAN8)/perl-nocem.8 $D$(MAN5)/nocem.ctl.5
Modified: doc/pod/motd.news.pod
===================================================================
--- doc/pod/motd.news.pod 2010-10-29 22:39:50 UTC (rev 9144)
+++ doc/pod/motd.news.pod 2010-10-30 09:44:46 UTC (rev 9145)
@@ -1,24 +1,28 @@
=head1 NAME
-motd.news - Message of the day information for readers
+motd.news - Message of the day information for feeders or readers
=head1 DESCRIPTION
-This file, found in I<pathetc>/motd.news, contains local information for
-news readers in a free-form format. The entire file is returned verbatim
+Two files, found in I<pathetc>, contain local information for news feeders or
+news readers in a free-form format. The entire files are returned verbatim
to any client that issues the LIST MOTD command. This might be used for
new information, notification of upcoming downtime, or similar purposes.
-Make sure that the F<motd.news> file is encoded in UTF-8. It should also
-be "dot-stuffed", that is to say that a line beginning with a dot should
-have that dot doubled.
+These files are named F<motd.innd> (for news feeders) and F<motd.nnrpd>
+(for news readers); they are used by B<innd> and B<nnrpd>, respectively.
+Make sure that these files are encoded in UTF-8. They should also be
+"dot-stuffed", that is to say that a line beginning with a dot should have
+that dot doubled.
+
Be aware that use of the LIST MOTD command is not widespread (though
documented in S<RFC 6048>) and most news clients will never ask for
this file.
-If this file is missing, it is not an error. The server will just send
-the client the appropriate response for an unmaintained F<motd.news> file.
+If one or both of these files are missing, it is not an error. The server
+will just send the client the appropriate response for an unmaintained
+F<motd.innd> or F<motd.nnrpd> file.
=head1 HISTORY
Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod 2010-10-29 22:39:50 UTC (rev 9144)
+++ doc/pod/news.pod 2010-10-30 09:44:46 UTC (rev 9145)
@@ -157,6 +157,20 @@
=item *
+B<nnrpd> advertises the COUNTS, DISTRIBUTIONS, MODERATORS, MOTD and
+SUBSCRIPTIONS variants of the LIST command in response to CAPABILITIES.
+These commands already existed in B<nnrpd> but S<RFC 6048> had not yet
+been published.
+
+=item *
+
+Add support for LIST MOTD in B<innd>. Consequently, the F<motd.news>
+configuration file which was previously used only by B<nnrpd> is renamed
+to F<motd.nnrpd> (B<innupgrade> takes care of the rename). B<innd> uses
+the new F<motd.innd> file in I<pathetc> for its message of the day.
+
+=item *
+
Fixed an issue at configure time that made INN wrongly assume that OpenBSD
(4.6) didn't support Unix-domain sockets. Thanks to Wim Lewis for the patch.
Modified: include/inn/paths.h.in
===================================================================
--- include/inn/paths.h.in 2010-10-29 22:39:50 UTC (rev 9144)
+++ include/inn/paths.h.in 2010-10-30 09:44:46 UTC (rev 9145)
@@ -65,7 +65,8 @@
#define INN_PATH_NNTPPASS "passwd.nntp"
#define INN_PATH_NNRPACCESS "readers.conf"
#define INN_PATH_EXPIRECTL "expire.ctl"
-#define INN_PATH_MOTD "motd.news"
+#define INN_PATH_MOTD_INND "motd.innd"
+#define INN_PATH_MOTD_NNRPD "motd.nnrpd"
#define INN_PATH_STORAGECTL "storage.conf"
#define INN_PATH_RADIUS_CONFIG "radius.conf"
#define INN_PATH_FILESYSTEMS "filesystems"
Modified: innd/nc.c
===================================================================
--- innd/nc.c 2010-10-29 22:39:50 UTC (rev 9144)
+++ innd/nc.c 2010-10-30 09:44:46 UTC (rev 9145)
@@ -72,7 +72,7 @@
COMMAND("IHAVE", NCihave, true, 2, 2, true,
"message-ID"),
COMMAND("LIST", NClist, true, 1, 3, true,
- "[ACTIVE|ACTIVE.TIMES|NEWSGROUPS [wildmat]]"),
+ "[ACTIVE [wildmat]|ACTIVE.TIMES [wildmat]|MOTD|NEWSGROUPS [wildmat]]"),
COMMAND("MODE", NCmode, false, 2, 2, true,
"READER"),
COMMAND("QUIT", NCquit, false, 1, 1, true,
@@ -600,7 +600,7 @@
}
if (cp->IsAuthenticated && !cp->Nolist) {
- WCHANappend(cp, "LIST ACTIVE ACTIVE.TIMES NEWSGROUPS", 35);
+ WCHANappend(cp, "LIST ACTIVE ACTIVE.TIMES MOTD NEWSGROUPS", 40);
WCHANappend(cp, NCterm, strlen(NCterm));
}
@@ -797,6 +797,7 @@
char *p, *path, *save;
char savec;
char *buff = NULL;
+ bool checkutf8 = false;
cp->Start = cp->Next;
@@ -841,7 +842,7 @@
free(buff);
return;
} else {
- xasprintf(&buff, "%d Descriptions in form \"group description\"",
+ xasprintf(&buff, "%d Newsgroup descriptions in form \"group description\"",
NNTP_OK_LIST);
NCwritereply(cp, buff);
free(buff);
@@ -851,17 +852,41 @@
qp = QIOopen(path);
free(path);
if (qp == NULL) {
- xasprintf(&buff, "%d No list of creation times available",
+ xasprintf(&buff, "%d No list of newsgroup creation times available",
NNTP_ERR_UNAVAILABLE);
NCwritereply(cp, buff);
free(buff);
return;
} else {
- xasprintf(&buff, "%d Group creations in form \"name time who\"",
+ xasprintf(&buff, "%d Newsgroup creation times in form \"group time who\"",
NNTP_OK_LIST);
NCwritereply(cp, buff);
free(buff);
}
+ } else if (strcasecmp(cp->av[1], "MOTD") == 0) {
+ checkutf8 = true;
+ if (cp->ac > 2) {
+ xasprintf(&buff, "%d Unexpected wildmat or argument",
+ NNTP_ERR_SYNTAX);
+ NCwritereply(cp, buff);
+ free(buff);
+ return;
+ }
+ path = concatpath(innconf->pathetc, INN_PATH_MOTD_INND);
+ qp = QIOopen(path);
+ free(path);
+ if (qp == NULL) {
+ xasprintf(&buff, "%d No message of the day available",
+ NNTP_ERR_UNAVAILABLE);
+ NCwritereply(cp, buff);
+ free(buff);
+ return;
+ } else {
+ xasprintf(&buff, "%d Message of the day text in UTF-8",
+ NNTP_OK_LIST);
+ NCwritereply(cp, buff);
+ free(buff);
+ }
} else {
xasprintf(&buff, "%d Unknown LIST keyword", NNTP_ERR_SYNTAX);
NCwritereply(cp, buff);
@@ -878,6 +903,14 @@
continue;
}
+ if (checkutf8) {
+ if (!is_valid_utf8(p)) {
+ syslog(L_ERROR, "%s NClist bad encoding in %s (UTF-8 expected)",
+ CHANname(cp), cp->av[1]);
+ continue;
+ }
+ }
+
/* Check whether the newsgroup matches the wildmat pattern,
* if given. */
if (cp->ac == 3) {
Modified: nnrpd/list.c
===================================================================
--- nnrpd/list.c 2010-10-29 22:39:50 UTC (rev 9144)
+++ nnrpd/list.c 2010-10-30 09:44:46 UTC (rev 9145)
@@ -24,48 +24,49 @@
static void cmd_list_headers(LISTINFO *lp, int ac, char *av[]);
static LISTINFO INFOactive = {
- "ACTIVE", INN_PATH_ACTIVE, NULL, true, "active newsgroups",
+ "ACTIVE", INN_PATH_ACTIVE, NULL, true, "list of active newsgroups",
"Newsgroups in form \"group high low status\""
};
static LISTINFO INFOactivetimes = {
- "ACTIVE.TIMES", INN_PATH_ACTIVETIMES, NULL, false, "creation times",
- "Group creations in form \"name time who\""
+ "ACTIVE.TIMES", INN_PATH_ACTIVETIMES, NULL, false, "list of newsgroup creation times",
+ "Newsgroup creation times in form \"group time who\""
};
static LISTINFO INFOcounts = {
- "COUNTS", INN_PATH_ACTIVE, NULL, true, "active newsgroups with counts",
+ "COUNTS", INN_PATH_ACTIVE, NULL, true, "list of active newsgroups with estimated counts",
"Newsgroups in form \"group high low count status\""
};
static LISTINFO INFOdistribs = {
- "DISTRIBUTIONS", INN_PATH_NNRPDIST, NULL, false, "newsgroup distributions",
+ "DISTRIBUTIONS", INN_PATH_NNRPDIST, NULL, false, "list of newsgroup distributions",
"Distributions in form \"distribution description\""
};
static LISTINFO INFOheaders = {
- "HEADERS", NULL, cmd_list_headers, true, "supported headers and metadata",
+ "HEADERS", NULL, cmd_list_headers, true, "list of supported headers and metadata items",
"Headers and metadata items supported"
};
static LISTINFO INFOsubs = {
"SUBSCRIPTIONS", INN_PATH_NNRPSUBS, NULL, false,
- "recommended group subscriptions", "Subscriptions in form \"group\""
+ "list of recommended newsgroup subscriptions",
+ "Recommended subscriptions in form \"group\""
};
static LISTINFO INFOdistribpats = {
- "DISTRIB.PATS", INN_PATH_DISTPATS, NULL, false, "distribution patterns",
+ "DISTRIB.PATS", INN_PATH_DISTPATS, NULL, false, "list of distribution patterns",
"Default distributions in form \"weight:group-pattern:distribution\""
};
static LISTINFO INFOgroups = {
- "NEWSGROUPS", INN_PATH_NEWSGROUPS, NULL, true, "newsgroup descriptions",
- "Descriptions in form \"group description\""
+ "NEWSGROUPS", INN_PATH_NEWSGROUPS, NULL, true, "list of newsgroup descriptions",
+ "Newsgroup descriptions in form \"group description\""
};
static LISTINFO INFOmoderators = {
- "MODERATORS", INN_PATH_MODERATORS, NULL, false, "moderator patterns",
- "Newsgroup moderators in form \"group-pattern:mail-address-pattern\""
+ "MODERATORS", INN_PATH_MODERATORS, NULL, false, "list of submission templates",
+ "Newsgroup moderators in form \"group-pattern:submission-template\""
};
static LISTINFO INFOschema = {
"OVERVIEW.FMT", NULL, cmd_list_schema, true, "overview format",
"Order of fields in overview database"
};
static LISTINFO INFOmotd = {
- "MOTD", INN_PATH_MOTD, NULL, false, "motd",
- "Message of the day text"
+ "MOTD", INN_PATH_MOTD_NNRPD, NULL, false, "message of the day",
+ "Message of the day text in UTF-8"
};
static LISTINFO *info[] = {
@@ -225,7 +226,7 @@
/* Three arguments can be passed only when ACTIVE, ACTIVE.TIMES, COUNTS
* HEADERS, NEWSGROUPS or SUBSCRIPTIONS keywords are used. */
if (ac > 2 && !wildarg) {
- Reply("%d Unexpected wildmat\r\n", NNTP_ERR_SYNTAX);
+ Reply("%d Unexpected wildmat or argument\r\n", NNTP_ERR_SYNTAX);
return;
}
@@ -245,7 +246,7 @@
qp = QIOopen(path);
free(path);
if (qp == NULL) {
- Reply("%d No list of %s available\r\n",
+ Reply("%d No %s available\r\n",
NNTP_ERR_UNAVAILABLE, lp->Items);
/* Only the active and newsgroups files are required. */
if (lp->Required || errno != ENOENT) {
Modified: nnrpd/nnrpd.c
===================================================================
--- nnrpd/nnrpd.c 2010-10-29 22:39:50 UTC (rev 9144)
+++ nnrpd/nnrpd.c 2010-10-30 09:44:46 UTC (rev 9145)
@@ -419,7 +419,8 @@
Printf("IHAVE\r\n");
}
- Printf("LIST ACTIVE ACTIVE.TIMES DISTRIB.PATS HEADERS NEWSGROUPS OVERVIEW.FMT\r\n");
+ Printf("LIST ACTIVE ACTIVE.TIMES COUNTS DISTRIB.PATS DISTRIBUTIONS"
+ " HEADERS MODERATORS MOTD NEWSGROUPS OVERVIEW.FMT SUBSCRIPTIONS\r\n");
if (PERMaccessconf->allownewnews && PERMcanread) {
Printf("NEWNEWS\r\n");
Modified: perl/INN/Config.pm.in
===================================================================
--- perl/INN/Config.pm.in 2010-10-29 22:39:50 UTC (rev 9144)
+++ perl/INN/Config.pm.in 2010-10-30 09:44:46 UTC (rev 9145)
@@ -61,7 +61,8 @@
## Paths of useful files.
my @FILESVAR = qw($active $activetimes $newactive $oldactive
$history $newsgroups $ctlfile $ctlwatch $localgroups
-$newsfeeds $path_motd $expirectl $errlog $log);
+$newsfeeds $path_motd_innd $path_motd_nnrpd $path_motd
+$expirectl $errlog $log);
our $active = "${pathdb}/active";
our $activetimes = "${pathdb}/active.times";
our $newactive = "${pathdb}/active.tmp";
@@ -72,7 +73,9 @@
our $ctlwatch = "${newsetc}/innwatch.ctl";
our $localgroups = "${newsetc}/localgroups";
our $newsfeeds = "${newsetc}/newsfeeds";
-our $path_motd = "${newsetc}/motd.news";
+our $path_motd_innd = "${newsetc}/motd.innd";
+our $path_motd_nnrpd = "${newsetc}/motd.nnrpd";
+our $path_motd = "${path_motd_nnrpd}";
our $expirectl = "${newsetc}/expire.ctl";
our $errlog = "${most_logs}/errlog";
our $log = "${most_logs}/news";
Added: samples/motd.innd
===================================================================
--- samples/motd.innd (rev 0)
+++ samples/motd.innd 2010-10-30 09:44:46 UTC (rev 9145)
@@ -0,0 +1,5 @@
+Sample "message of the day" file. Any text you put in here will be returned
+to the news feeder when it issues the LIST MOTD command to innd.
+
+It is not an error if this file does not exist nor if it is empty. However,
+it must be encoded in UTF-8.
Property changes on: trunk/samples/motd.innd
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Deleted: samples/motd.news
===================================================================
--- samples/motd.news 2010-10-29 22:39:50 UTC (rev 9144)
+++ samples/motd.news 2010-10-30 09:44:46 UTC (rev 9145)
@@ -1,4 +0,0 @@
-Sample "message of the day" file. Any text you put in here will be
-returned to the news reader when it issues the LIST MOTD command.
-It is not an error if this file does not exist nor if it is empty.
-However, it must be encoded in UTF-8.
Copied: trunk/samples/motd.nnrpd (from rev 9112, trunk/samples/motd.news)
===================================================================
--- samples/motd.nnrpd (rev 0)
+++ samples/motd.nnrpd 2010-10-30 09:44:46 UTC (rev 9145)
@@ -0,0 +1,5 @@
+Sample "message of the day" file. Any text you put in here will be returned
+to the news reader when it issues the LIST MOTD command to nnrpd.
+
+It is not an error if this file does not exist nor if it is empty. However,
+it must be encoded in UTF-8.
Modified: scripts/innshellvars.in
===================================================================
--- scripts/innshellvars.in 2010-10-29 22:39:50 UTC (rev 9144)
+++ scripts/innshellvars.in 2010-10-30 09:44:46 UTC (rev 9145)
@@ -45,7 +45,9 @@
NEWSFEEDS=${NEWSETC}/newsfeeds
NEWSGROUPS=${PATHDB}/newsgroups
OLDACTIVE=${PATHDB}/active.old
-PATH_MOTD=${NEWSETC}/motd.news
+PATH_MOTD_INND=${NEWSETC}/motd.innd
+PATH_MOTD_NNRPD=${NEWSETC}/motd.nnrpd
+PATH_MOTD=${PATH_MOTD_NNRPD}
EXPIRECTL=${NEWSETC}/expire.ctl
LOCALGROUPS=${NEWSETC}/localgroups
Modified: scripts/innshellvars.pl.in
===================================================================
--- scripts/innshellvars.pl.in 2010-10-29 22:39:50 UTC (rev 9144)
+++ scripts/innshellvars.pl.in 2010-10-30 09:44:46 UTC (rev 9145)
@@ -57,7 +57,9 @@
$newsfeeds = "${newsetc}/newsfeeds" ;
$newsgroups = "${pathdb}/newsgroups" ;
$oldactive = "${pathdb}/active.old" ;
-$path_motd = "${newsetc}/motd.news" ;
+$path_motd_innd = "${newsetc}/motd.innd" ;
+$path_motd_nnrpd = "${newsetc}/motd.nnrpd" ;
+$path_motd = "${path_motd_nnrpd}" ;
$expirectl = "${newsetc}/expire.ctl" ;
$localgroups = "$newsetc/localgroups" ;
Modified: scripts/innshellvars.tcl.in
===================================================================
--- scripts/innshellvars.tcl.in 2010-10-29 22:39:50 UTC (rev 9144)
+++ scripts/innshellvars.tcl.in 2010-10-30 09:44:46 UTC (rev 9145)
@@ -52,7 +52,9 @@
set inn_newsfeeds "${inn_newsetc}/newsfeeds"
set inn_newsgroups "${inn_pathdb}/newsgroups"
set inn_oldactive "${inn_pathdb}/active.old"
-set inn_path_motd "${inn_newsetc}/motd.news"
+set inn_path_motd_innd "${inn_newsetc}/motd.innd"
+set inn_path_motd_nnrpd "${inn_newsetc}/motd.nnrpd"
+set inn_path_motd "${inn_path_motd_nnrpd}"
set inn_expirectl "${inn_newsetc}/expire.ctl"
set inn_localgroups "${inn_newsetc}/localgroups"
Modified: scripts/innupgrade.in
===================================================================
--- scripts/innupgrade.in 2010-10-29 22:39:50 UTC (rev 9144)
+++ scripts/innupgrade.in 2010-10-30 09:44:46 UTC (rev 9145)
@@ -26,6 +26,7 @@
## addinjectiondate and addinjectionpostinghost in inn.conf.
## * Move parameters from overview.fmt to inn.conf if needed.
## * Move parameters from sasl.conf to inn.conf if needed.
+## * Rename or remove obsolete files.
## * Change startinnfeed to innfeed or imapfeed in newsfeeds.
require 5.003;
@@ -63,8 +64,11 @@
'hook-tcl' => 'hook-tcl.OLD', # Obsolete Tcl hooks in INN 2.5.0.
'filter.tcl' => 'filter.tcl.OLD',
- 'startup.tcl' => 'startup.tcl.OLD');
+ 'startup.tcl' => 'startup.tcl.OLD',
+ 'motd.news' => 'motd.nnrpd' # Rename in INN 2.5.3.
+ );
+
# Clean up inn.conf for the new parser in INN 2.4. Null keys (keys without
# values) need to be commented out since they're no longer allowed (don't just
# remove them entirely since people may want them there as examples), and
Property changes on: trunk/site
___________________________________________________________________
Modified: svn:ignore
- INN.py
active.minimal
actsync.cfg
actsync.ign
buffindexed.conf
config
control.ctl
control.ctl.local
cycbuff.conf
distrib.pats
distributions
expire.ctl
filter.tcl
filter_innd.pl
filter_innd.py
filter_nnrpd.pl
incoming.conf
inn.conf
innfeed.conf
innreport.conf
innreport.css
innshellvars.local
innshellvars.pl.local
innshellvars.tcl.local
innwatch.ctl
localgroups
moderators
motd.news
news2mail.cf
newsfeeds
newsgroups.minimal
nnrpd.py
nnrpd.track
nnrpd_access.pl
nnrpd_auth.pl
nnrpd_auth.py
nnrpd_access.py
nnrpd_dynamic.py
nntpsend.ctl
nocem.ctl
ovdb.conf
passwd.nntp
radius.conf
readers.conf
sasl.conf
send-uucp.cf
startup.tcl
startup_innd.pl
storage.conf
subscriptions
update
+ INN.py
active.minimal
actsync.cfg
actsync.ign
buffindexed.conf
config
control.ctl
control.ctl.local
cycbuff.conf
distrib.pats
distributions
expire.ctl
filter.tcl
filter_innd.pl
filter_innd.py
filter_nnrpd.pl
incoming.conf
inn.conf
innfeed.conf
innreport.conf
innreport.css
innshellvars.local
innshellvars.pl.local
innshellvars.tcl.local
innwatch.ctl
localgroups
moderators
motd.innd
motd.nnrpd
news2mail.cf
newsfeeds
newsgroups.minimal
nnrpd.py
nnrpd.track
nnrpd_access.pl
nnrpd_auth.pl
nnrpd_auth.py
nnrpd_access.py
nnrpd_dynamic.py
nntpsend.ctl
nocem.ctl
ovdb.conf
passwd.nntp
radius.conf
readers.conf
sasl.conf
send-uucp.cf
startup.tcl
startup_innd.pl
storage.conf
subscriptions
update
Modified: site/Makefile
===================================================================
--- site/Makefile 2010-10-29 22:39:50 UTC (rev 9144)
+++ site/Makefile 2010-10-30 09:44:46 UTC (rev 9145)
@@ -40,7 +40,8 @@
PATH_CTLWATCH = ${PATHETC}/innwatch.ctl
PATH_ACTSYNC_IGN = ${PATHETC}/actsync.ign
PATH_ACTSYNC_CFG = ${PATHETC}/actsync.cfg
-PATH_MOTD = ${PATHETC}/motd.news
+PATH_MOTD_INND = ${PATHETC}/motd.innd
+PATH_MOTD_NNRPD = ${PATHETC}/motd.nnrpd
PATH_STORAGECONF = ${PATHETC}/storage.conf
PATH_CYCBUFFCONFIG = ${PATHETC}/cycbuff.conf
PATH_INNFEEDCTL = ${PATHETC}/innfeed.conf
@@ -61,7 +62,7 @@
inn.conf moderators innreport.conf innreport.css localgroups \
control.ctl control.ctl.local expire.ctl nntpsend.ctl \
innwatch.ctl distrib.pats distributions actsync.cfg actsync.ign \
- motd.news storage.conf cycbuff.conf buffindexed.conf \
+ motd.innd motd.nnrpd storage.conf cycbuff.conf buffindexed.conf \
innfeed.conf startup_innd.pl filter_innd.pl filter_nnrpd.pl \
filter_innd.py INN.py \
innshellvars.local innshellvars.pl.local innshellvars.tcl.local \
@@ -84,7 +85,7 @@
$D$(PATHETC)/localgroups \
$D$(PATH_CTLWATCH) $D$(PATH_DISTPATS) $D$(PATH_DISTRIBUTIONS) \
$D$(PATH_ACTSYNC_CFG) $D$(PATH_ACTSYNC_IGN) \
- $D$(PATH_MOTD) $D$(PATH_STORAGECONF) \
+ $D$(PATH_MOTD_INND) $D$(PATH_MOTD_NNRPD) $D$(PATH_STORAGECONF) \
$D$(PATH_CYCBUFFCONFIG) $D$(PATH_BUFFINDEXED) \
$D$(PATH_INNFEEDCTL) $D$(PATH_PERL_STARTUP_INND) \
$D$(PATH_PERL_FILTER_INND) $D$(PATH_PERL_FILTER_NNRPD) \
@@ -217,7 +218,8 @@
$D$(PATHETC)/nocem.ctl: nocem.ctl ; $(COPY_RPUB) $? $@
$D$(PATH_ACTSYNC_CFG): actsync.cfg ; $(COPY_RPUB) $? $@
$D$(PATH_ACTSYNC_IGN): actsync.ign ; $(COPY_RPUB) $? $@
-$D$(PATH_MOTD): motd.news ; $(COPY_RPUB) $? $@
+$D$(PATH_MOTD_INND): motd.innd ; $(COPY_RPUB) $? $@
+$D$(PATH_MOTD_NNRPD): motd.nnrpd ; $(COPY_RPUB) $? $@
$D$(PATH_INNFEEDCTL): innfeed.conf ; $(COPY_RPRI) $? $@
$D$(PATH_SENDUUCP_CF): send-uucp.cf ; $(COPY_RPUB) $? $@
$D$(PATH_SUBSCRIPTIONS): subscriptions ; $(COPY_RPUB) $? $@
@@ -267,7 +269,8 @@
moderators: ../samples/moderators ; $(COPY) $? $@
distrib.pats: ../samples/distrib.pats ; $(COPY) $? $@
distributions: ../samples/distributions ; $(COPY) $? $@
-motd.news: ../samples/motd.news ; $(COPY) $? $@
+motd.innd: ../samples/motd.innd ; $(COPY) $? $@
+motd.nnrpd: ../samples/motd.nnrpd ; $(COPY) $? $@
news2mail.cf: ../samples/news2mail.cf ; $(COPY) $? $@
newsfeeds: ../samples/newsfeeds ; $(COPY) $? $@
nnrpd.track: ../samples/nnrpd.track ; $(COPY) $? $@
Modified: support/mkmanifest
===================================================================
--- support/mkmanifest 2010-10-29 22:39:50 UTC (rev 9144)
+++ support/mkmanifest 2010-10-30 09:44:46 UTC (rev 9145)
@@ -224,7 +224,8 @@
site/innwatch.ctl
site/localgroups
site/moderators
-site/motd.news
+site/motd.innd
+site/motd.nnrpd
site/news2mail.cf
site/newsfeeds
site/newsgroups.minimal
More information about the inn-committers
mailing list