INN commit: branches (16 files)
INN Commit
rra at isc.org
Fri May 24 16:28:28 UTC 2013
Date: Friday, May 24, 2013 @ 09:28:27
Author: iulius
Revision: 9478
rename radius.conf to inn-radius.conf
The name of the radius.conf configuration file shipped with INN
conflicts with the libradius package.
innupgrade will take care of the renaming.
Reported by Jochen Schmitt.
Added:
branches/2.5/doc/pod/inn-radius.conf.pod
(from rev 9476, trunk/doc/pod/inn-radius.conf.pod)
branches/2.5/samples/inn-radius.conf
(from rev 9476, trunk/samples/inn-radius.conf)
Modified:
branches/2.5/ (properties)
branches/2.5/MANIFEST
branches/2.5/doc/man/ (properties)
branches/2.5/doc/man/Makefile
branches/2.5/doc/pod/Makefile
branches/2.5/doc/pod/news.pod
branches/2.5/doc/pod/radius.pod
branches/2.5/include/inn/paths.h.in
branches/2.5/scripts/innupgrade.in
branches/2.5/site/ (properties)
branches/2.5/site/Makefile
branches/2.5/support/mkmanifest
Deleted:
branches/2.5/doc/pod/radius.conf.pod
branches/2.5/samples/radius.conf
-----------------------------+
MANIFEST | 6 +-
doc/man/Makefile | 2
doc/pod/Makefile | 4 -
doc/pod/inn-radius.conf.pod | 109 ++++++++++++++++++++++++++++++++++++++++++
doc/pod/news.pod | 7 ++
doc/pod/radius.conf.pod | 109 ------------------------------------------
doc/pod/radius.pod | 8 +--
include/inn/paths.h.in | 2
samples/inn-radius.conf | 63 ++++++++++++++++++++++++
samples/radius.conf | 63 ------------------------
scripts/innupgrade.in | 4 +
site/Makefile | 8 +--
support/mkmanifest | 2
13 files changed, 198 insertions(+), 189 deletions(-)
Property changes on: branches/2.5
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk:9476-9477
Modified: 2.5/MANIFEST
===================================================================
--- 2.5/MANIFEST 2013-05-24 16:21:15 UTC (rev 9477)
+++ 2.5/MANIFEST 2013-05-24 16:28:27 UTC (rev 9478)
@@ -153,6 +153,7 @@
doc/man/ident.8 Manpage for ident resolver
doc/man/incoming.conf.5 Manpage for incoming.conf config file
doc/man/inews.1 Manpage for inews frontend
+doc/man/inn-radius.conf.5 Manpage for inn-radius.conf config file
doc/man/inn.conf.5 Manpage for inn.conf config file
doc/man/innbind.8 Manpage for innbind
doc/man/inncheck.8 Manpage for inncheck utility
@@ -206,7 +207,6 @@
doc/man/pullnews.1 Manpage for pullnews
doc/man/qio.3 Manpage for fast I/O file routines
doc/man/radius.8 Manpage for radius authenticator
-doc/man/radius.conf.5 Manpage for radius.conf config file
doc/man/rc.news.8 Manpage for rc.news
doc/man/readers.conf.5 Manpage for readers.conf config file
doc/man/rnews.1 Manpage for rnews frontend
@@ -265,6 +265,7 @@
doc/pod/ident.pod Master file for ident.8
doc/pod/incoming.conf.pod Master file for incoming.conf.5
doc/pod/inews.pod Master file for inews.1
+doc/pod/inn-radius.conf.pod Master file for inn-radius.conf.5
doc/pod/inn.conf.pod Master file for inn.conf.5
doc/pod/innbind.pod Master file for innbind.8
doc/pod/inncheck.pod Master file for inncheck.8
@@ -307,7 +308,6 @@
doc/pod/prunehistory.pod Master file for prunehistory.8
doc/pod/pullnews.pod Master file for pullnews.1
doc/pod/qio.pod Master file for qio.3
-doc/pod/radius.conf.pod Master file for radius.conf.5
doc/pod/radius.pod Master file for radius.8
doc/pod/rc.news.pod Master file for rc.news.8
doc/pod/readers.conf.pod Master file for readers.conf.5
@@ -629,6 +629,7 @@
samples/filter_innd.py Sample Python filter for innd
samples/filter_nnrpd.pl Sample Perl filter for nnrpd
samples/incoming.conf Permissions for incoming feeds
+samples/inn-radius.conf Sample config for RADIUS authentication
samples/inn.conf.in General INN configuration
samples/innfeed.conf Outgoing feed configuration
samples/innreport.conf.in Log summary configuration
@@ -660,7 +661,6 @@
samples/nocem.ctl Config file for perl-nocem
samples/ovdb.conf Berkeley DB overview configuration
samples/passwd.nntp Passwords for remote connections
-samples/radius.conf Sample config for RADIUS authentication
samples/readers.conf Reader connection configuration
samples/send-uucp.cf send-uucp configuration file
samples/startup_innd.pl Perl startup code for innd
Property changes on: branches/2.5/doc/man
___________________________________________________________________
Modified: svn:ignore
- active.5
active.times.5
actsync.8
archive.8
auth_krb5.8
batcher.8
buffchan.8
buffindexed.conf.5
ckpasswd.8
cnfsheadconf.8
cnfsstat.8
control.ctl.5
controlchan.8
convdate.1
ctlinnd.8
cvtbatch.8
cycbuff.conf.5
distrib.pats.5
distributions.5
docheckgroups.8
domain.8
expire.ctl.5
expire.8
expireover.8
expirerm.8
fastrm.1
getlist.1
grephistory.1
ident.8
incoming.conf.5
inews.1
inn.conf.5
INN__Config.3pm
INN__Utils__Shlock.3pm
innbind.8
inncheck.8
innconfval.1
innd.8
inndf.8
innfeed.conf.5
innfeed.8
innmail.1
innupgrade.8
innxmit.8
libauth.3
libinnhist.3
libstorage.3
list.3
mailpost.8
makedbz.8
makehistory.8
mod-active.8
moderators.5
motd.news.5
newsfeeds.5
news.daily.8
news2mail.8
newslog.5
newsgroups.5
ninpaths.8
nnrpd.8
nntpsend.8
nntpsend.ctl.5
ovdb.5
ovdb_init.8
ovdb_monitor.8
ovdb_server.8
ovdb_stat.8
overchan.8
passwd.nntp.5
perl-nocem.8
pgpverify.1
procbatch.8
prunehistory.8
pullnews.1
qio.3
radius.8
radius.conf.5
rc.news.8
readers.conf.5
rnews.1
sasl.conf.5
scanlogs.8
scanspool.8
send-uucp.8
sendinpaths.8
shlock.1
simpleftp.1
sm.1
storage.conf.5
subscriptions.5
tally.control.8
tdx-util.8
tinyleaf.8
tst.3
uwildmat.3
+ active.5
active.times.5
actsync.8
archive.8
auth_krb5.8
batcher.8
buffchan.8
buffindexed.conf.5
ckpasswd.8
cnfsheadconf.8
cnfsstat.8
control.ctl.5
controlchan.8
convdate.1
ctlinnd.8
cvtbatch.8
cycbuff.conf.5
distrib.pats.5
distributions.5
docheckgroups.8
domain.8
expire.ctl.5
expire.8
expireover.8
expirerm.8
fastrm.1
getlist.1
grephistory.1
ident.8
incoming.conf.5
inews.1
inn-radius.conf.5
inn.conf.5
INN__Config.3pm
INN__Utils__Shlock.3pm
innbind.8
inncheck.8
innconfval.1
innd.8
inndf.8
innfeed.conf.5
innfeed.8
innmail.1
innupgrade.8
innxmit.8
libauth.3
libinnhist.3
libstorage.3
list.3
mailpost.8
makedbz.8
makehistory.8
mod-active.8
moderators.5
motd.news.5
newsfeeds.5
news.daily.8
news2mail.8
newslog.5
newsgroups.5
ninpaths.8
nnrpd.8
nntpsend.8
nntpsend.ctl.5
ovdb.5
ovdb_init.8
ovdb_monitor.8
ovdb_server.8
ovdb_stat.8
overchan.8
passwd.nntp.5
perl-nocem.8
pgpverify.1
procbatch.8
prunehistory.8
pullnews.1
qio.3
radius.8
rc.news.8
readers.conf.5
rnews.1
sasl.conf.5
scanlogs.8
scanspool.8
send-uucp.8
sendinpaths.8
shlock.1
simpleftp.1
sm.1
storage.conf.5
subscriptions.5
tally.control.8
tdx-util.8
tinyleaf.8
tst.3
uwildmat.3
Modified: 2.5/doc/man/Makefile
===================================================================
--- 2.5/doc/man/Makefile 2013-05-24 16:21:15 UTC (rev 9477)
+++ 2.5/doc/man/Makefile 2013-05-24 16:28:27 UTC (rev 9478)
@@ -18,7 +18,7 @@
cycbuff.conf.5 distrib.pats.5 distributions.5 expire.ctl.5 history.5 incoming.conf.5 \
inn.conf.5 innfeed.conf.5 innwatch.ctl.5 moderators.5 motd.news.5 \
newsfeeds.5 newsgroups.5 newslog.5 nnrpd.track.5 nntpsend.ctl.5 ovdb.5 \
- passwd.nntp.5 radius.conf.5 readers.conf.5 \
+ passwd.nntp.5 inn-radius.conf.5 readers.conf.5 \
storage.conf.5 subscriptions.5
SEC8 = actsync.8 archive.8 batcher.8 buffchan.8 ckpasswd.8 \
Modified: 2.5/doc/pod/Makefile
===================================================================
--- 2.5/doc/pod/Makefile 2013-05-24 16:21:15 UTC (rev 9477)
+++ 2.5/doc/pod/Makefile 2013-05-24 16:28:27 UTC (rev 9478)
@@ -25,7 +25,7 @@
../man/inn.conf.5 ../man/innfeed.conf.5 ../man/moderators.5 \
../man/motd.news.5 ../man/newsfeeds.5 ../man/newsgroups.5 \
../man/newslog.5 ../man/nntpsend.ctl.5 ../man/ovdb.5 \
- ../man/passwd.nntp.5 ../man/radius.conf.5 ../man/readers.conf.5 \
+ ../man/passwd.nntp.5 ../man/inn-radius.conf.5 ../man/readers.conf.5 \
../man/storage.conf.5 ../man/subscriptions.5
MAN8 = ../man/actsync.8 ../man/archive.8 ../man/auth_krb5.8 \
@@ -106,7 +106,7 @@
../man/nntpsend.ctl.5: nntpsend.ctl.pod ; $(POD2MAN) -s 5 $? > $@
../man/ovdb.5: ovdb.pod ; $(POD2MAN) -s 5 $? > $@
../man/passwd.nntp.5: passwd.nntp.pod ; $(POD2MAN) -s 5 $? > $@
-../man/radius.conf.5: radius.conf.pod ; $(POD2MAN) -s 5 $? > $@
+../man/inn-radius.conf.5: inn-radius.conf.pod ; $(POD2MAN) -s 5 $? > $@
../man/readers.conf.5: readers.conf.pod ; $(POD2MAN) -s 5 $? > $@
../man/storage.conf.5: storage.conf.pod ; $(POD2MAN) -s 5 $? > $@
../man/subscriptions.5: subscriptions.pod ; $(POD2MAN) -s 5 $? > $@
Copied: branches/2.5/doc/pod/inn-radius.conf.pod (from rev 9476, trunk/doc/pod/inn-radius.conf.pod)
===================================================================
--- 2.5/doc/pod/inn-radius.conf.pod (rev 0)
+++ 2.5/doc/pod/inn-radius.conf.pod 2013-05-24 16:28:27 UTC (rev 9478)
@@ -0,0 +1,109 @@
+=head1 NAME
+
+inn-radius.conf - Configuration for nnrpd RADIUS authenticator
+
+=head1 DESCRIPTION
+
+This describes the format and attributes of the configuration file for the
+nnrpd RADIUS authenticator. See radius(8) for more information about the
+authenticator program. The default location for this file is
+F<inn-radius.conf> in I<pathetc>.
+
+Blank lines and lines beginning with C<#> are ignored, as is anything
+after a C<#> on a line. All other lines should begin with a parameter
+name followed by a colon and the value of that key, except that each
+section of configuration for a particular server should be enclosed in:
+
+ server <name> {
+ # parameters...
+ }
+
+where <name> is just some convenient label for that server.
+
+The available parameters are:
+
+=over 4
+
+=item I<radhost>
+
+The hostname of the RADIUS server to use for authentication. This
+parameter must be set.
+
+=item I<radport>
+
+The port to query on the RADIUS server. Defaults to 1645 if not set.
+
+=item I<lochost>
+
+The hostname or IP address making the request. The RADIUS server expects
+an IP address; a hostname will be translated into an IP address with
+gethostbyname(). If not given, this information isn't included in the
+request (not all RADIUS setups require this information).
+
+=item I<locport>
+
+The port the client being authenticated is connecting to. If not given,
+defaults to 119. This doesn't need to be set unless readers are
+connecting to a non-standard port.
+
+=item I<secret>
+
+The shared secret with the RADIUS server. If your secret includes spaces,
+tabs, or C<#>, be sure to include it in double quotes. This parameter
+must be set.
+
+=item I<prefix>
+
+Prepend the value of this parameter to all usernames before passing them
+to the RADIUS server. Can be used to prepend something like C<news-> to
+all usernames in order to put news users into a different namespace from
+other accounts served by the same server. If not set, nothing is
+prepended.
+
+=item I<suffix>
+
+Append the value of this parameter to all usernames before passing them to
+the RADIUS server. This is often something like C<@example.com>,
+depending on how your RADIUS server is set up. If not set, nothing is
+appended.
+
+=item I<ignore-source>
+
+Can be set to C<true> or C<false>. If set to false, the RADIUS
+authenticator will check to ensure that the response it receives is from
+the same IP address as it sent the request to (for some added security).
+If set to true, it will skip this verification check (if your RADIUS
+server has multiple IP addresses or if other odd things are going on, it
+may be perfectly normal for the response to come from a different IP
+address).
+
+=back
+
+=head1 EXAMPLE
+
+Here is a configuration for a news server named news.example.com,
+authenticating users against radius.example.com and appending
+C<@example.com> to all client-supplied usernames before passing them to
+the RADIUS server:
+
+ server example {
+ radhost: radius.example.com
+ lochost: news.example.com
+ secret: IamARADIUSsecRET
+ suffix: @example.com
+ }
+
+The shared secret with the RADIUS server is C<IamARADIUSsecRET>.
+
+=head1 HISTORY
+
+This documentation was written by Russ Allbery <rra at stanford.edu> based on
+the comments in the sample F<inn-radius.conf> file by Yury S<B. Razbegin>.
+
+$Id$
+
+=head1 SEE ALSO
+
+radius(8)
+
+=cut
Modified: 2.5/doc/pod/news.pod
===================================================================
--- 2.5/doc/pod/news.pod 2013-05-24 16:21:15 UTC (rev 9477)
+++ 2.5/doc/pod/news.pod 2013-05-24 16:28:27 UTC (rev 9478)
@@ -4,6 +4,13 @@
=item *
+As the name of the F<radius.conf> configuration file shipped with INN
+for the B<nnrpd> authenticator against a RADIUS server conflicts with
+the libradius package, this file is renamed to F<inn-radius.conf>
+(B<innupgrade> takes care of the rename during the update).
+
+=item *
+
When using funnel feeds, B<innfeed> log files were open forever, which
resulted in empty log files, once rotated by B<scanlogs>. Exploder and
process channels are now reopened when C<ctlinnd flushlogs> is used,
Deleted: 2.5/doc/pod/radius.conf.pod
===================================================================
--- 2.5/doc/pod/radius.conf.pod 2013-05-24 16:21:15 UTC (rev 9477)
+++ 2.5/doc/pod/radius.conf.pod 2013-05-24 16:28:27 UTC (rev 9478)
@@ -1,109 +0,0 @@
-=head1 NAME
-
-radius.conf - Configuration for nnrpd RADIUS authenticator
-
-=head1 DESCRIPTION
-
-This describes the format and attributes of the configuration file for the
-nnrpd RADIUS authenticator. See radius(1) for more information about the
-authenticator program. The default location for this file is
-F<radius.conf> in I<pathetc>.
-
-Blank lines and lines beginning with C<#> are ignored, as is anything
-after a C<#> on a line. All other lines should begin with a parameter
-name followed by a colon and the value of that key, except that each
-section of configuration for a particular server should be enclosed in:
-
- server <name> {
- # parameters...
- }
-
-where <name> is just some convenient label for that server.
-
-The available parameters are:
-
-=over 4
-
-=item I<radhost>
-
-The hostname of the RADIUS server to use for authentication. This
-parameter must be set.
-
-=item I<radport>
-
-The port to query on the RADIUS server. Defaults to 1645 if not set.
-
-=item I<lochost>
-
-The hostname or IP address making the request. The RADIUS server expects
-an IP address; a hostname will be translated into an IP address with
-gethostbyname(). If not given, this information isn't included in the
-request (not all RADIUS setups require this information).
-
-=item I<locport>
-
-The port the client being authenticated is connecting to. If not given,
-defaults to 119. This doesn't need to be set unless readers are
-connecting to a non-standard port.
-
-=item I<secret>
-
-The shared secret with the RADIUS server. If your secret includes spaces,
-tabs, or C<#>, be sure to include it in double quotes. This parameter
-must be set.
-
-=item I<prefix>
-
-Prepend the value of this parameter to all usernames before passing them
-to the RADIUS server. Can be used to prepend something like C<news-> to
-all usernames in order to put news users into a different namespace from
-other accounts served by the same server. If not set, nothing is
-prepended.
-
-=item I<suffix>
-
-Append the value of this parameter to all usernames before passing them to
-the RADIUS server. This is often something like C<@example.com>,
-depending on how your RADIUS server is set up. If not set, nothing is
-appended.
-
-=item I<ignore-source>
-
-Can be set to C<true> or C<false>. If set to false, the RADIUS
-authenticator will check to ensure that the response it receives is from
-the same IP address as it sent the request to (for some added security).
-If set to true, it will skip this verification check (if your RADIUS
-server has multiple IP addresses or if other odd things are going on, it
-may be perfectly normal for the response to come from a different IP
-address).
-
-=back
-
-=head1 EXAMPLE
-
-Here is a configuration for a news server named news.example.com,
-authenticating users against radius.example.com and appending
-C<@example.com> to all client-supplied usernames before passing them to
-the RADIUS server:
-
- server example {
- radhost: radius.example.com
- lochost: news.example.com
- secret: IamARADIUSsecRET
- suffix: @example.com
- }
-
-The shared secret with the RADIUS server is C<IamARADIUSsecRET>.
-
-=head1 HISTORY
-
-This documentation was written by Russ Allbery <rra at stanford.edu> based on
-the comments in the sample F<radius.conf> file by Yury S<B. Razbegin>.
-
-$Id$
-
-=head1 SEE ALSO
-
-radius(1)
-
-=cut
Modified: 2.5/doc/pod/radius.pod
===================================================================
--- 2.5/doc/pod/radius.pod 2013-05-24 16:21:15 UTC (rev 9477)
+++ 2.5/doc/pod/radius.pod 2013-05-24 16:28:27 UTC (rev 9478)
@@ -16,9 +16,9 @@
authentication via RADIUS and wants to authenticate news reading
connections as well.
-By default, B<radius> reads I<pathetc>/radius.conf for configuration
+By default, B<radius> reads I<pathetc>/inn-radius.conf for configuration
information, but a different configuration file can be specified with
-B<-f>. See radius.conf(5) for a description of the configuration file.
+B<-f>. See inn-radius.conf(5) for a description of the configuration file.
=head1 OPTIONS
@@ -26,7 +26,7 @@
=item B<-f> I<config>
-Read I<config> instead of I<pathetc>/radius.conf for configuration
+Read I<config> instead of I<pathetc>/inn-radius.conf for configuration
information.
=item B<-h>
@@ -70,7 +70,7 @@
=head1 SEE ALSO
-nnrpd(8), radius.conf(5), readers.conf(5)
+inn-radius.conf(5), nnrpd(8), readers.conf(5)
S<RFC 2865>, Remote Authentication Dial In User Service.
Modified: 2.5/include/inn/paths.h.in
===================================================================
--- 2.5/include/inn/paths.h.in 2013-05-24 16:21:15 UTC (rev 9477)
+++ 2.5/include/inn/paths.h.in 2013-05-24 16:28:27 UTC (rev 9478)
@@ -68,7 +68,7 @@
#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_RADIUS_CONFIG "inn-radius.conf"
#define INN_PATH_FILESYSTEMS "filesystems"
/* Default prefix path is pathspool. */
Copied: branches/2.5/samples/inn-radius.conf (from rev 9476, trunk/samples/inn-radius.conf)
===================================================================
--- 2.5/samples/inn-radius.conf (rev 0)
+++ 2.5/samples/inn-radius.conf 2013-05-24 16:28:27 UTC (rev 9478)
@@ -0,0 +1,63 @@
+# $Id$
+#
+# Sample RADIUS configuration file for the RADIUS readers.conf
+# authenticator. If you're not using that authenticator, this file is not
+# used.
+
+server radius {
+
+# Hostname of the RADIUS server.
+
+#radhost: radius-server.example.com
+
+# Port to query on the RADIUS server.
+
+radport: 1645
+
+# Local hostname or IP address.
+#
+# The RADIUS server expects an IP address; a hostname will be translated
+# into an IP address with gethostbyname(). If not given, not included in
+# the request (not all RADIUS setups need this information).
+
+#lochost: news.example.com
+
+# Local port of connection.
+#
+# The port the client we're authenticating is connecting to. If not
+# given, defaults to 119. You'll only need to set this if you're readers
+# are connecting on a non-standard port.
+
+#locport: 119
+
+# Shared secret with RADIUS server.
+#
+# Be careful not to use the '#' symbol in your secret, since in this
+# file that indicates the beginning of a comment.
+
+#secret: SECRET-WORD
+
+# Prefix for username.
+#
+# Before given to the RADIUS server, usernames will be rewritten by
+# prepending the prefix, if given, and then appending the suffix, if
+# given.
+
+#prefix: news-
+
+# Suffix for username.
+
+#suffix: @example.com
+
+# Whether to ignore bad reply IP.
+#
+# If set to false, the RADIUS authenticator will check to ensure that the
+# response it receives is from the same IP address as it sent the request
+# to (for some added security). If set to true, it will skip this
+# verification check (if your RADIUS server has multiple IP addresses or
+# if other odd things are going on, it may be perfectly normal for the
+# response to come from a different IP address).
+
+ignore-source: false
+
+}
Deleted: 2.5/samples/radius.conf
===================================================================
--- 2.5/samples/radius.conf 2013-05-24 16:21:15 UTC (rev 9477)
+++ 2.5/samples/radius.conf 2013-05-24 16:28:27 UTC (rev 9478)
@@ -1,63 +0,0 @@
-# $Id$
-#
-# Sample RADIUS configuration file for the RADIUS readers.conf
-# authenticator. If you're not using that authenticator, this file is not
-# used.
-
-server radius {
-
-# Hostname of the RADIUS server.
-
-#radhost: radius-server.example.com
-
-# Port to query on the RADIUS server.
-
-radport: 1645
-
-# Local hostname or IP address.
-#
-# The RADIUS server expects an IP address; a hostname will be translated
-# into an IP address with gethostbyname(). If not given, not included in
-# the request (not all RADIUS setups need this information).
-
-#lochost: news.example.com
-
-# Local port of connection.
-#
-# The port the client we're authenticating is connecting to. If not
-# given, defaults to 119. You'll only need to set this if you're readers
-# are connecting on a non-standard port.
-
-#locport: 119
-
-# Shared secret with RADIUS server.
-#
-# Be careful not to use the '#' symbol in your secret, since in this
-# file that indicates the beginning of a comment.
-
-#secret: SECRET-WORD
-
-# Prefix for username.
-#
-# Before given to the RADIUS server, usernames will be rewritten by
-# prepending the prefix, if given, and then appending the suffix, if
-# given.
-
-#prefix: news-
-
-# Suffix for username.
-
-#suffix: @example.com
-
-# Whether to ignore bad reply IP.
-#
-# If set to false, the RADIUS authenticator will check to ensure that the
-# response it receives is from the same IP address as it sent the request
-# to (for some added security). If set to true, it will skip this
-# verification check (if your RADIUS server has multiple IP addresses or
-# if other odd things are going on, it may be perfectly normal for the
-# response to come from a different IP address).
-
-ignore-source: false
-
-}
Modified: 2.5/scripts/innupgrade.in
===================================================================
--- 2.5/scripts/innupgrade.in 2013-05-24 16:21:15 UTC (rev 9477)
+++ 2.5/scripts/innupgrade.in 2013-05-24 16:28:27 UTC (rev 9478)
@@ -66,7 +66,9 @@
'filter.tcl' => 'filter.tcl.OLD',
'startup.tcl' => 'startup.tcl.OLD',
- 'motd.news' => 'motd.nnrpd' # Rename in INN 2.5.3.
+ 'motd.news' => 'motd.nnrpd', # Rename in INN 2.5.3.
+ 'radius.conf' => 'inn-radius.conf', # Rename in INN 2.5.4.
+ 'radius.conf.5' => ''
);
# Clean up inn.conf for the new parser in INN 2.4. Null keys (keys without
Property changes on: branches/2.5/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.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
+ 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-radius.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
readers.conf
sasl.conf
send-uucp.cf
startup.tcl
startup_innd.pl
storage.conf
subscriptions
update
Modified: 2.5/site/Makefile
===================================================================
--- 2.5/site/Makefile 2013-05-24 16:21:15 UTC (rev 9477)
+++ 2.5/site/Makefile 2013-05-24 16:28:27 UTC (rev 9478)
@@ -46,7 +46,7 @@
PATH_CYCBUFFCONFIG = ${PATHETC}/cycbuff.conf
PATH_INNFEEDCTL = ${PATHETC}/innfeed.conf
PATH_BUFFINDEXED = ${PATHETC}/buffindexed.conf
-PATH_RADIUS_CONF = ${PATHETC}/radius.conf
+PATH_RADIUS_CONF = ${PATHETC}/inn-radius.conf
PATH_OVDB_CONF = ${PATHETC}/ovdb.conf
PATH_SENDUUCP_CF = ${PATHETC}/send-uucp.cf
PATH_SUBSCRIPTIONS = ${PATHETC}/subscriptions
@@ -69,7 +69,7 @@
nnrpd.py \
nnrpd_auth.pl nnrpd_access.pl nocem.ctl \
news2mail.cf readers.conf \
- radius.conf nnrpd_auth.py nnrpd_access.py nnrpd_dynamic.py \
+ inn-radius.conf nnrpd_auth.py nnrpd_access.py nnrpd_dynamic.py \
ovdb.conf active.minimal \
newsgroups.minimal send-uucp.cf subscriptions
@@ -184,7 +184,7 @@
$D$(PATH_INNDHOSTS): incoming.conf ; $(COPY_RPRI) $? $@
$D$(PATH_NEWSFEEDS): newsfeeds ; $(COPY_RPUB) $? $@
$D$(PATH_READERSCONF): readers.conf ; $(COPY_RPUB) $? $@
-$D$(PATH_RADIUS_CONF): radius.conf ; $(COPY_RPRI) $? $@
+$D$(PATH_RADIUS_CONF): inn-radius.conf ; $(COPY_RPRI) $? $@
$D$(PATH_NNRPDTRACK): nnrpd.track ; $(COPY_RPUB) $? $@
$D$(PATH_CONTROLCTL): control.ctl ; $(COPY_RPUB) $? $@
$D$(PATH_CONTROLCTLLOCAL): control.ctl.local ; $(COPY_RPUB) $? $@
@@ -282,7 +282,7 @@
parsecontrol: ../samples/parsecontrol ; $(COPY) $? $@
passwd.nntp: ../samples/passwd.nntp ; $(COPY) $? $@
readers.conf: ../samples/readers.conf ; $(COPY) $? $@
-radius.conf: ../samples/radius.conf ; $(COPY) $? $@
+inn-radius.conf: ../samples/inn-radius.conf ; $(COPY) $? $@
startup_innd.pl: ../samples/startup_innd.pl ; $(COPY) $? $@
send-uucp.cf: ../samples/send-uucp.cf ; $(COPY) $? $@
subscriptions: ../samples/subscriptions ; $(COPY) $? $@
Modified: 2.5/support/mkmanifest
===================================================================
--- 2.5/support/mkmanifest 2013-05-24 16:21:15 UTC (rev 9477)
+++ 2.5/support/mkmanifest 2013-05-24 16:28:27 UTC (rev 9478)
@@ -215,6 +215,7 @@
site/filter_innd.py
site/filter_nnrpd.pl
site/incoming.conf
+site/inn-radius.conf
site/inn.conf
site/innfeed.conf
site/innreport.conf
@@ -241,7 +242,6 @@
site/nocem.ctl
site/ovdb.conf
site/passwd.nntp
-site/radius.conf
site/readers.conf
site/send-uucp.cf
site/startup_innd.pl
More information about the inn-committers
mailing list