INN commit: trunk/control (6 files)

INN Commit Russ_Allbery at isc.org
Sat Jan 3 18:16:24 UTC 2009


    Date: Saturday, January 3, 2009 @ 10:16:23
  Author: iulius
Revision: 8274

* Mention that the newsgroups file is in $INN::Config::pathdb when
  a mail is sent to the news administrator.
* Add " (Moderated)" to the end of an empty newsgroup description
  if the newsgroups is moderated.
* Remove trailing useless spaces.

Modified:
  trunk/control/modules/ihave.pl
  trunk/control/modules/newgroup.pl
  trunk/control/modules/rmgroup.pl
  trunk/control/modules/sendsys.pl
  trunk/control/perl-nocem.in
  trunk/control/signcontrol.in

---------------------+
 modules/ihave.pl    |    2 +-
 modules/newgroup.pl |   11 ++++++-----
 modules/rmgroup.pl  |    2 +-
 modules/sendsys.pl  |    2 +-
 perl-nocem.in       |    4 ++--
 signcontrol.in      |    4 ++--
 6 files changed, 13 insertions(+), 12 deletions(-)

Modified: modules/ihave.pl
===================================================================
--- modules/ihave.pl	2008-12-31 21:49:09 UTC (rev 8273)
+++ modules/ihave.pl	2009-01-03 18:16:23 UTC (rev 8274)
@@ -47,7 +47,7 @@
                . "Subject: cmsg sendme $INN::Config::pathhost\n"
                . "Control: sendme $INN::Config::pathhost\n\n";
             open(TEMPFILE, $tempfile) or logdie("Cannot open $tempfile: $!");
-            print $inews $_ while <TEMPFILE>;  
+            print $inews $_ while <TEMPFILE>;
             close $inews or die $!;
             close TEMPFILE;
         }

Modified: modules/newgroup.pl
===================================================================
--- modules/newgroup.pl	2008-12-31 21:49:09 UTC (rev 8273)
+++ modules/newgroup.pl	2009-01-03 18:16:23 UTC (rev 8274)
@@ -47,10 +47,11 @@
         last;
     }
     close ACTIVE;
-    
+
     my $status;
     my $ngdesc = 'No description.';
-    my $olddesc = '';    
+    $ngdesc .= ' (Moderated)' if $modflag eq 'moderated';
+    my $olddesc = '';
     my $ngname = $groupname;
 
     # If there is a tag line, search whether the description has changed.
@@ -64,7 +65,7 @@
         }
         $found = 1 if $_ =~ /^For your newsgroups file:\s*$/;
     }
-    
+
     if ($found) {
       ($ngname, $ngdesc) = split(/\s+/, $ngline, 2);
       if ($ngdesc) {
@@ -112,7 +113,7 @@
   $INN::Config::newsbin/ctlinnd newgroup $groupname $modcmd $sender
 
 And do not forget to update the corresponding description in your
-newsgroups file.
+$INN::Config::pathdb/newsgroups file.
 
 The control message follows:
 
@@ -138,7 +139,7 @@
             # We know the description has changed.
             update_desc($ngname, $ngdesc) if $ngdesc and $ngname eq $groupname;
         }
-        
+
         if ($log) {
             logger($log, "newgroup $groupname $modcmd $status $sender",
                    $headers, $body) if ($log ne 'mail' or $status ne 'no change');

Modified: modules/rmgroup.pl
===================================================================
--- modules/rmgroup.pl	2008-12-31 21:49:09 UTC (rev 8273)
+++ modules/rmgroup.pl	2009-01-03 18:16:23 UTC (rev 8274)
@@ -50,7 +50,7 @@
   $INN::Config::newsbin/ctlinnd rmgroup $groupname
 
 And do not forget to remove the corresponding description, if any,
-from your newsgroups file.
+from your $INN::Config::pathdb/newsgroups file.
 
 The control message follows:
 

Modified: modules/sendsys.pl
===================================================================
--- modules/sendsys.pl	2008-12-31 21:49:09 UTC (rev 8273)
+++ modules/sendsys.pl	2009-01-03 18:16:23 UTC (rev 8274)
@@ -26,7 +26,7 @@
         my $mail = sendmail("sendsys $sender");
         print $mail <<END;
 $sender has requested that you send a copy
-of your newsgroups file.
+of your $INN::Config::pathdb/newsgroups file.
 
 If this is acceptable, type:
   $INN::Config::mailcmd -s "sendsys reply from $INN::Config::pathhost" $replyto < $INN::Config::newsfeeds

Modified: perl-nocem.in
===================================================================
--- perl-nocem.in	2008-12-31 21:49:09 UTC (rev 8273)
+++ perl-nocem.in	2009-01-03 18:16:23 UTC (rev 8274)
@@ -330,7 +330,7 @@
 # Read article.
 sub open_article {
     my $token = shift;
-    
+
     if ($token =~ /^\@.+\@$/) {
         my $pid = open(ART, '-|');
         if ($pid < 0) {
@@ -383,7 +383,7 @@
 sub cancel_nntp {
     my $ids = shift;
     my $r;
-    
+
     if ($nntp_open and time - $socket_timeout > $last_cancel) {
         logmsg('Close socket for timeout');
         close (NNTP);

Modified: signcontrol.in
===================================================================
--- signcontrol.in	2008-12-31 21:49:09 UTC (rev 8273)
+++ signcontrol.in	2009-01-03 18:16:23 UTC (rev 8274)
@@ -150,7 +150,7 @@
 #   valid reasons to ignore it  in  unusual  circumstances,  but
 #   this  should  be  done  only after careful study of the full
 #   implications and a firm conclusion  that  it  is  necessary,
-#   because  there are serious disadvantages to doing so. 
+#   because  there are serious disadvantages to doing so.
 # as opposed to "MUST" which means:
 #   means that the item is an absolute requirement of the specification
 # MUST is preferred, but might not be acceptable if you have legacy
@@ -193,7 +193,7 @@
     die "$0: ERROR PROCESSING Subject: $header{'Subject'}\n", $die;
   } else {
     die $die;
-  } 
+  }
 }
 
 &signit;




More information about the inn-committers mailing list