Send inn-committers mailing list submissions to inn-committers@lists.isc.org
To subscribe or unsubscribe via the World Wide Web, visit https://lists.isc.org/mailman/listinfo/inn-committers or, via email, send a message with subject or body 'help' to inn-committers-requ...@lists.isc.org You can reach the person managing the list at inn-committers-ow...@lists.isc.org When replying, please edit your Subject line so it is more specific than "Re: Contents of inn-committers digest..." Today's Topics: 1. INN commit: trunk (doc/pod/news.pod nnrpd/post.c) (INN Commit) 2. INN commit: branches/2.5 (doc/pod/news.pod nnrpd/post.c) (INN Commit) 3. INN commit: trunk (doc/pod/news.pod nnrpd/perm.c) (INN Commit) 4. INN commit: branches/2.5 (doc/pod/news.pod nnrpd/perm.c) (INN Commit) 5. INN commit: trunk (5 files) (INN Commit) 6. INN commit: branches/2.5 (5 files) (INN Commit) ---------------------------------------------------------------------- Message: 1 Date: Mon, 17 Feb 2014 05:10:24 -0800 (PST) From: INN Commit <r...@isc.org> To: inn-committ...@isc.org Subject: INN commit: trunk (doc/pod/news.pod nnrpd/post.c) Message-ID: <20140217131024.c134c67...@hope.eyrie.org> Date: Monday, February 17, 2014 @ 05:10:24 Author: iulius Revision: 9600 nnrpd: fixed an overlapping copy Fixed an issue where users were denied posting because of an overlapping buffer copy in a check nnrpd was doing. The error seen was "address not in Internet syntax" while using a From: address of the form <a...@test1.de>. Debugging revealed that nnrpd copies a buffer into itself to look at the part behind the "@", and for very specific inputs on an old version of nnrpd that still uses strcpy, the result did not contain the dot separating the top-level domain any more. Thanks to Florian Schlichting for the patch. Modified: trunk/doc/pod/news.pod trunk/nnrpd/post.c ------------------+ doc/pod/news.pod | 6 ++++++ nnrpd/post.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) Modified: doc/pod/news.pod =================================================================== --- doc/pod/news.pod 2014-02-08 13:56:54 UTC (rev 9599) +++ doc/pod/news.pod 2014-02-17 13:10:24 UTC (rev 9600) @@ -221,6 +221,12 @@ =item * +Fixed an issue where users were denied posting because of an overlapping +buffer copy in a check B<nnrpd> was doing. Thanks to Florian Schlichting +for the patch. + +=item * + Fixed a regression that occurred in S<INN 2.5.3> regarding the path used by default by B<pullnews> for its configuration file. Instead of looking in the running user's home directory, it was looking in the I<pathnews> Modified: nnrpd/post.c =================================================================== --- nnrpd/post.c 2014-02-08 13:56:54 UTC (rev 9599) +++ nnrpd/post.c 2014-02-17 13:10:24 UTC (rev 9600) @@ -1107,8 +1107,7 @@ HeaderCleanFrom(frombuf); p = strchr(frombuf, '@'); if (p) { - strlcpy(frombuf, p+1, sizeof(frombuf)); - p = strrchr(frombuf, '.'); + p = strrchr(p+1, '.'); if (!p) { if (modgroup) free(modgroup); ------------------------------ Message: 2 Date: Mon, 17 Feb 2014 05:13:43 -0800 (PST) From: INN Commit <r...@isc.org> To: inn-committ...@isc.org Subject: INN commit: branches/2.5 (doc/pod/news.pod nnrpd/post.c) Message-ID: <20140217131344.0aec467...@hope.eyrie.org> Date: Monday, February 17, 2014 @ 05:13:43 Author: iulius Revision: 9601 nnrpd: fixed an overlapping copy Fixed an issue where users were denied posting because of an overlapping buffer copy in a check nnrpd was doing. The error seen was "address not in Internet syntax" while using a From: address of the form <a...@test1.de>. Debugging revealed that nnrpd copies a buffer into itself to look at the part behind the "@", and for very specific inputs on an old version of nnrpd that still uses strcpy, the result did not contain the dot separating the top-level domain any more. Thanks to Florian Schlichting for the patch. Modified: branches/2.5/doc/pod/news.pod branches/2.5/nnrpd/post.c ------------------+ doc/pod/news.pod | 6 ++++++ nnrpd/post.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) Modified: doc/pod/news.pod =================================================================== --- doc/pod/news.pod 2014-02-17 13:10:24 UTC (rev 9600) +++ doc/pod/news.pod 2014-02-17 13:13:43 UTC (rev 9601) @@ -49,6 +49,12 @@ =item * +Fixed an issue where users were denied posting because of an overlapping +buffer copy in a check B<nnrpd> was doing. Thanks to Florian Schlichting +for the patch. + +=item * + Fixed a regression that occurred in S<INN 2.5.3> regarding the path used by default by B<pullnews> for its configuration file. Instead of looking in the running user's home directory, it was looking in the I<pathnews> Modified: nnrpd/post.c =================================================================== --- nnrpd/post.c 2014-02-17 13:10:24 UTC (rev 9600) +++ nnrpd/post.c 2014-02-17 13:13:43 UTC (rev 9601) @@ -1090,8 +1090,7 @@ HeaderCleanFrom(frombuf); p = strchr(frombuf, '@'); if (p) { - strlcpy(frombuf, p+1, sizeof(frombuf)); - p = strrchr(frombuf, '.'); + p = strrchr(p+1, '.'); if (!p) { if (modgroup) free(modgroup); ------------------------------ Message: 3 Date: Mon, 17 Feb 2014 05:17:37 -0800 (PST) From: INN Commit <r...@isc.org> To: inn-committ...@isc.org Subject: INN commit: trunk (doc/pod/news.pod nnrpd/perm.c) Message-ID: <20140217131737.7eac567...@hope.eyrie.org> Date: Monday, February 17, 2014 @ 05:17:35 Author: iulius Revision: 9602 readers.conf: make mandatory the program: key in res blocks Fixed a segfault occurring in nnrpd when a res block was used in readers.conf without the program: key. This key is now explicitly made mandatory. Modified: trunk/doc/pod/news.pod trunk/nnrpd/perm.c ------------------+ doc/pod/news.pod | 5 +++++ nnrpd/perm.c | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) Modified: doc/pod/news.pod =================================================================== --- doc/pod/news.pod 2014-02-17 13:13:43 UTC (rev 9601) +++ doc/pod/news.pod 2014-02-17 13:17:35 UTC (rev 9602) @@ -221,6 +221,11 @@ =item * +Fixed a segfault occurring in B<nnrpd> when a res block was used in +F<readers.conf> without the program: key. + +=item * + Fixed an issue where users were denied posting because of an overlapping buffer copy in a check B<nnrpd> was doing. Thanks to Florian Schlichting for the patch. Modified: nnrpd/perm.c =================================================================== --- nnrpd/perm.c 2014-02-17 13:13:43 UTC (rev 9601) +++ nnrpd/perm.c 2014-02-17 13:17:35 UTC (rev 9602) @@ -284,7 +284,11 @@ memset(ConfigBit, '\0', ConfigBitsize); ret->name = xstrdup(orig->name); - ret->program = xstrdup(orig->program); + if (orig->program != NULL) { + ret->program = xstrdup(orig->program); + } else { + ret->program = NULL; + } if (orig->users) ret->users = xstrdup(orig->users); else @@ -716,6 +720,10 @@ tok = CONFgettoken(PERMtoks, f); } + if (m->program == NULL) { + ReportError(f, "Missing 'program:' key."); + } + if (tok == NULL) { ReportError(f, "Unexpected EOF."); } ------------------------------ Message: 4 Date: Mon, 17 Feb 2014 05:18:21 -0800 (PST) From: INN Commit <r...@isc.org> To: inn-committ...@isc.org Subject: INN commit: branches/2.5 (doc/pod/news.pod nnrpd/perm.c) Message-ID: <20140217131821.b9fb767...@hope.eyrie.org> Date: Monday, February 17, 2014 @ 05:18:21 Author: iulius Revision: 9603 readers.conf: make mandatory the program: key in res blocks Fixed a segfault occurring in nnrpd when a res block was used in readers.conf without the program: key. This key is now explicitly made mandatory. Modified: branches/2.5/doc/pod/news.pod branches/2.5/nnrpd/perm.c ------------------+ doc/pod/news.pod | 5 +++++ nnrpd/perm.c | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) Modified: doc/pod/news.pod =================================================================== --- doc/pod/news.pod 2014-02-17 13:17:35 UTC (rev 9602) +++ doc/pod/news.pod 2014-02-17 13:18:21 UTC (rev 9603) @@ -49,6 +49,11 @@ =item * +Fixed a segfault occurring in B<nnrpd> when a res block was used in +F<readers.conf> without the program: key. + +=item * + Fixed an issue where users were denied posting because of an overlapping buffer copy in a check B<nnrpd> was doing. Thanks to Florian Schlichting for the patch. Modified: nnrpd/perm.c =================================================================== --- nnrpd/perm.c 2014-02-17 13:17:35 UTC (rev 9602) +++ nnrpd/perm.c 2014-02-17 13:18:21 UTC (rev 9603) @@ -284,7 +284,11 @@ memset(ConfigBit, '\0', ConfigBitsize); ret->name = xstrdup(orig->name); - ret->program = xstrdup(orig->program); + if (orig->program != NULL) { + ret->program = xstrdup(orig->program); + } else { + ret->program = NULL; + } if (orig->users) ret->users = xstrdup(orig->users); else @@ -716,6 +720,10 @@ tok = CONFgettoken(PERMtoks, f); } + if (m->program == NULL) { + ReportError(f, "Missing 'program:' key."); + } + if (tok == NULL) { ReportError(f, "Unexpected EOF."); } ------------------------------ Message: 5 Date: Mon, 17 Feb 2014 10:03:37 -0800 (PST) From: INN Commit <r...@isc.org> To: inn-committ...@isc.org Subject: INN commit: trunk (5 files) Message-ID: <20140217180337.323ab67...@hope.eyrie.org> Date: Monday, February 17, 2014 @ 10:03:36 Author: iulius Revision: 9604 do not install motd files by default, but only samples On a fresh INN install, motd.innd and motd.nnrpd are no longer installed by default. Instead, samples for these files are provided in >pathetc>, named differently so that their default contents are not displayed to news clients before they get customised. Modified: trunk/doc/pod/motd.news.pod trunk/doc/pod/news.pod trunk/samples/motd.innd trunk/samples/motd.nnrpd trunk/site/Makefile -----------------------+ doc/pod/motd.news.pod | 5 ++++ doc/pod/news.pod | 7 +++++ samples/motd.innd | 52 ++++++++++++++++++++++++++++++++++++++--- samples/motd.nnrpd | 60 ++++++++++++++++++++++++++++++++++++++++++++---- site/Makefile | 4 +-- 5 files changed, 118 insertions(+), 10 deletions(-) Modified: doc/pod/motd.news.pod =================================================================== --- doc/pod/motd.news.pod 2014-02-17 13:18:21 UTC (rev 9603) +++ doc/pod/motd.news.pod 2014-02-17 18:03:36 UTC (rev 9604) @@ -24,6 +24,11 @@ will just send the client the appropriate response for an unmaintained F<motd.innd> or F<motd.nnrpd> file. +On a fresh INN install, samples for these files are installed +in I<pathec>; you will therefore find in F<motd.innd.sample> and +F<motd.nnrpd.sample> a few examples of messages that can be communicated +to news clients. + =head1 HISTORY Rewritten in POD by Russ Allbery <r...@stanford.edu> for InterNetNews. Modified: doc/pod/news.pod =================================================================== --- doc/pod/news.pod 2014-02-17 13:18:21 UTC (rev 9603) +++ doc/pod/news.pod 2014-02-17 18:03:36 UTC (rev 9604) @@ -269,6 +269,13 @@ F<-L/usr/lib> to the linker include flags; unconditionally adding it may break the build on systems using lib32 and lib64 directories. +=item * + +On a fresh INN install, F<motd.innd> and F<motd.nnrpd> are no longer +installed by default. Instead, samples for these files are provided +in I<pathetc>, named differently so that their default contents are +not displayed to news clients before they get customised. + =back =head1 Changes in 2.5.3 Modified: samples/motd.innd =================================================================== --- samples/motd.innd 2014-02-17 13:18:21 UTC (rev 9603) +++ samples/motd.innd 2014-02-17 18:03:36 UTC (rev 9604) @@ -1,5 +1,49 @@ -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. +Here are a few suggestions of messages to display to peers feeding news +articles to the server. -It is not an error if this file does not exist nor if it is empty. However, -it must be encoded in UTF-8. +The contents of this file is displayed in reply to the LIST MOTD command +from feeders. + +Just rename this file to "motd.innd" and adjust its contents to whatever +message of the day (encoded in UTF-8) you want to communicate. It is +not an error if this file does not exist nor if it is empty. + +For more information, please have a look at the generic motd.news +man page. + + +Example 1 +--------- + +Attention all users, + +This server will be down for scheduled upgrades on February 1st. +It should be back up by 8:00 a.m. February 2nd. +Any questions should be e-mailed to <newsmas...@example.com>. + +Apologies for the disturbance. + + +Example 2 +--------- + +This news server now carries the comp.* hierarchy. Feel free to add +it to the list of hierarchies you feed us. + + +Example 3 +--------- + +This news server no longer accepts articles whose length exceeds 32 +768 bytes. Please configure your server not to send us such articles. + + +Example 4 +--------- + +Starting from February 1st, the IP of this news server will change. +Note that its host name remains the same. + +In case explicit rules based on IP exist at your end (firewall, iptables, +feed configuration, etc.), please update them to use 10.0.0.1 as the +IP of our news server. Modified: samples/motd.nnrpd =================================================================== --- samples/motd.nnrpd 2014-02-17 13:18:21 UTC (rev 9603) +++ samples/motd.nnrpd 2014-02-17 18:03:36 UTC (rev 9604) @@ -1,5 +1,57 @@ -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. +Here are a few suggestions of messages to display to news readers +accessing the server. -It is not an error if this file does not exist nor if it is empty. However, -it must be encoded in UTF-8. +The contents of this file is displayed in reply to the LIST MOTD command +from readers. + +Just rename this file to "motd.nnrpd" and adjust its contents to whatever +message of the day (encoded in UTF-8) you want to communicate. It is +not an error if this file does not exist nor if it is empty. + +For more information, please have a look at the generic motd.news +man page. + + +Example 1 +--------- + +Attention all users, + +This server will be down for scheduled upgrades on February 1st. +It should be back up by 8:00 a.m. February 2nd. +Any questions should be e-mailed to <newsmas...@example.com>. + +Apologies for the disturbance. + + +Example 2 +--------- + +Dear customers, + +We are pleased to announce the creation of a support newsgroup, named +"our.company.support". It was created on February 1st and is intended +to receive your questions about the use of our services. Our support +team will usually be responding within a couple of days. + +Please use this new newsgroup as the preferable means to contact us. + + +Example 3 +--------- + +This news server now supports TLS connections. Please configure your +news reader to use TLS when connecting or authenticating. A tutorial +is available in the "our.company.tutorials" newsgroup to help you do +the change. Do not hesitate to ask for help in the "our.company.support" +newsgroup if you encounter issues during the change. + +Starting from February 1st, unencrypted authentications (that is to +say not using TLS) will be rejected. + + +Example 4 +--------- + +Support for a new SASL mechanism has been added: OPENID20 can now be +used to authenticate. Feel free to use it! Modified: site/Makefile =================================================================== --- site/Makefile 2014-02-17 13:18:21 UTC (rev 9603) +++ site/Makefile 2014-02-17 18:03:36 UTC (rev 9604) @@ -40,8 +40,8 @@ PATH_CTLWATCH = ${PATHETC}/innwatch.ctl PATH_ACTSYNC_IGN = ${PATHETC}/actsync.ign PATH_ACTSYNC_CFG = ${PATHETC}/actsync.cfg -PATH_MOTD_INND = ${PATHETC}/motd.innd -PATH_MOTD_NNRPD = ${PATHETC}/motd.nnrpd +PATH_MOTD_INND = ${PATHETC}/motd.innd.sample +PATH_MOTD_NNRPD = ${PATHETC}/motd.nnrpd.sample PATH_STORAGECONF = ${PATHETC}/storage.conf PATH_CYCBUFFCONFIG = ${PATHETC}/cycbuff.conf PATH_INNFEEDCTL = ${PATHETC}/innfeed.conf ------------------------------ Message: 6 Date: Mon, 17 Feb 2014 10:04:21 -0800 (PST) From: INN Commit <r...@isc.org> To: inn-committ...@isc.org Subject: INN commit: branches/2.5 (5 files) Message-ID: <20140217180421.9ca5f67...@hope.eyrie.org> Date: Monday, February 17, 2014 @ 10:04:21 Author: iulius Revision: 9605 do not install motd files by default, but only samples On a fresh INN install, motd.innd and motd.nnrpd are no longer installed by default. Instead, samples for these files are provided in >pathetc>, named differently so that their default contents are not displayed to news clients before they get customised. Modified: branches/2.5/doc/pod/motd.news.pod branches/2.5/doc/pod/news.pod branches/2.5/samples/motd.innd branches/2.5/samples/motd.nnrpd branches/2.5/site/Makefile -----------------------+ doc/pod/motd.news.pod | 5 ++++ doc/pod/news.pod | 7 +++++ samples/motd.innd | 52 ++++++++++++++++++++++++++++++++++++++--- samples/motd.nnrpd | 60 ++++++++++++++++++++++++++++++++++++++++++++---- site/Makefile | 4 +-- 5 files changed, 118 insertions(+), 10 deletions(-) Modified: doc/pod/motd.news.pod =================================================================== --- doc/pod/motd.news.pod 2014-02-17 18:03:36 UTC (rev 9604) +++ doc/pod/motd.news.pod 2014-02-17 18:04:21 UTC (rev 9605) @@ -24,6 +24,11 @@ will just send the client the appropriate response for an unmaintained F<motd.innd> or F<motd.nnrpd> file. +On a fresh INN install, samples for these files are installed +in I<pathec>; you will therefore find in F<motd.innd.sample> and +F<motd.nnrpd.sample> a few examples of messages that can be communicated +to news clients. + =head1 HISTORY Rewritten in POD by Russ Allbery <r...@stanford.edu> for InterNetNews. Modified: doc/pod/news.pod =================================================================== --- doc/pod/news.pod 2014-02-17 18:03:36 UTC (rev 9604) +++ doc/pod/news.pod 2014-02-17 18:04:21 UTC (rev 9605) @@ -97,6 +97,13 @@ F<-L/usr/lib> to the linker include flags; unconditionally adding it may break the build on systems using lib32 and lib64 directories. +=item * + +On a fresh INN install, F<motd.innd> and F<motd.nnrpd> are no longer +installed by default. Instead, samples for these files are provided +in I<pathetc>, named differently so that their default contents are +not displayed to news clients before they get customised. + =back =head1 Changes in 2.5.3 Modified: samples/motd.innd =================================================================== --- samples/motd.innd 2014-02-17 18:03:36 UTC (rev 9604) +++ samples/motd.innd 2014-02-17 18:04:21 UTC (rev 9605) @@ -1,5 +1,49 @@ -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. +Here are a few suggestions of messages to display to peers feeding news +articles to the server. -It is not an error if this file does not exist nor if it is empty. However, -it must be encoded in UTF-8. +The contents of this file is displayed in reply to the LIST MOTD command +from feeders. + +Just rename this file to "motd.innd" and adjust its contents to whatever +message of the day (encoded in UTF-8) you want to communicate. It is +not an error if this file does not exist nor if it is empty. + +For more information, please have a look at the generic motd.news +man page. + + +Example 1 +--------- + +Attention all users, + +This server will be down for scheduled upgrades on February 1st. +It should be back up by 8:00 a.m. February 2nd. +Any questions should be e-mailed to <newsmas...@example.com>. + +Apologies for the disturbance. + + +Example 2 +--------- + +This news server now carries the comp.* hierarchy. Feel free to add +it to the list of hierarchies you feed us. + + +Example 3 +--------- + +This news server no longer accepts articles whose length exceeds 32 +768 bytes. Please configure your server not to send us such articles. + + +Example 4 +--------- + +Starting from February 1st, the IP of this news server will change. +Note that its host name remains the same. + +In case explicit rules based on IP exist at your end (firewall, iptables, +feed configuration, etc.), please update them to use 10.0.0.1 as the +IP of our news server. Modified: samples/motd.nnrpd =================================================================== --- samples/motd.nnrpd 2014-02-17 18:03:36 UTC (rev 9604) +++ samples/motd.nnrpd 2014-02-17 18:04:21 UTC (rev 9605) @@ -1,5 +1,57 @@ -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. +Here are a few suggestions of messages to display to news readers +accessing the server. -It is not an error if this file does not exist nor if it is empty. However, -it must be encoded in UTF-8. +The contents of this file is displayed in reply to the LIST MOTD command +from readers. + +Just rename this file to "motd.nnrpd" and adjust its contents to whatever +message of the day (encoded in UTF-8) you want to communicate. It is +not an error if this file does not exist nor if it is empty. + +For more information, please have a look at the generic motd.news +man page. + + +Example 1 +--------- + +Attention all users, + +This server will be down for scheduled upgrades on February 1st. +It should be back up by 8:00 a.m. February 2nd. +Any questions should be e-mailed to <newsmas...@example.com>. + +Apologies for the disturbance. + + +Example 2 +--------- + +Dear customers, + +We are pleased to announce the creation of a support newsgroup, named +"our.company.support". It was created on February 1st and is intended +to receive your questions about the use of our services. Our support +team will usually be responding within a couple of days. + +Please use this new newsgroup as the preferable means to contact us. + + +Example 3 +--------- + +This news server now supports TLS connections. Please configure your +news reader to use TLS when connecting or authenticating. A tutorial +is available in the "our.company.tutorials" newsgroup to help you do +the change. Do not hesitate to ask for help in the "our.company.support" +newsgroup if you encounter issues during the change. + +Starting from February 1st, unencrypted authentications (that is to +say not using TLS) will be rejected. + + +Example 4 +--------- + +Support for a new SASL mechanism has been added: OPENID20 can now be +used to authenticate. Feel free to use it! Modified: site/Makefile =================================================================== --- site/Makefile 2014-02-17 18:03:36 UTC (rev 9604) +++ site/Makefile 2014-02-17 18:04:21 UTC (rev 9605) @@ -40,8 +40,8 @@ PATH_CTLWATCH = ${PATHETC}/innwatch.ctl PATH_ACTSYNC_IGN = ${PATHETC}/actsync.ign PATH_ACTSYNC_CFG = ${PATHETC}/actsync.cfg -PATH_MOTD_INND = ${PATHETC}/motd.innd -PATH_MOTD_NNRPD = ${PATHETC}/motd.nnrpd +PATH_MOTD_INND = ${PATHETC}/motd.innd.sample +PATH_MOTD_NNRPD = ${PATHETC}/motd.nnrpd.sample PATH_STORAGECONF = ${PATHETC}/storage.conf PATH_CYCBUFFCONFIG = ${PATHETC}/cycbuff.conf PATH_INNFEEDCTL = ${PATHETC}/innfeed.conf ------------------------------ _______________________________________________ inn-committers mailing list inn-committers@lists.isc.org https://lists.isc.org/mailman/listinfo/inn-committers End of inn-committers Digest, Vol 60, Issue 2 *********************************************