# HG changeset patch
# User godisch
# Date 1049192865 -3600
# Node ID fd66260b3479e74d51cbbf615049ba4faf1f7365
# Parent  33833f23bc13d9e8dc887118de4c4754a1364bdc
[svn] fixed article cancelling (Debian #187068)

diff -r 33833f23bc13 -r fd66260b3479 ChangeLog
--- a/ChangeLog	Sat Mar 29 11:15:36 2003 +0000
+++ b/ChangeLog	Tue Apr 01 11:27:45 2003 +0100
@@ -1,3 +1,13 @@
+Mon Apr 01 2003 Martin Godisch <martin@godisch.de>
+
+* src/post.c:
+  Forward cancel control messages to parent NNTP servers,
+  see Debian bug #187068.
+* docs/noffle.1:
+  Noted that option --cancel acts only locally.
+* src/noffle.c:
+  Removed cancel status message which appeared twice.
+
 Sat Mar 22 2003 Johannes Madel <johannes.madel@gmx.de>
 
 * src/post.c,src/configfile.c,src/configfile.h,docs/noffle.conf.5,
diff -r 33833f23bc13 -r fd66260b3479 docs/noffle.1
--- a/docs/noffle.1	Sat Mar 29 11:15:36 2003 +0000
+++ b/docs/noffle.1	Tue Apr 01 11:27:45 2003 +0100
@@ -1,5 +1,5 @@
 .TH noffle 1
-.\" $Id: noffle.1 426 2003-01-31 15:34:47Z bears $
+.\" $Id: noffle.1 505 2003-04-01 10:27:45Z godisch $
 .SH NAME
 noffle \- Usenet package optimized for dialup connections.
 
@@ -146,6 +146,8 @@
 shell interpretation of '<' and '>').
 .br
 This option is only available to news administrators.
+It will not cancel articles on remote news servers, use a cancel
+control message instead if you need to do so.
 
 .TP
 .B \-C, \-\-create <local newsgroup name>
diff -r 33833f23bc13 -r fd66260b3479 src/noffle.c
--- a/src/noffle.c	Sat Mar 29 11:15:36 2003 +0000
+++ b/src/noffle.c	Tue Apr 01 11:27:45 2003 +0100
@@ -10,7 +10,7 @@
   received for some seconds (to allow multiple clients connect at the same
   time).
 
-  $Id: noffle.c 454 2003-02-21 16:02:01Z bears $
+  $Id: noffle.c 505 2003-04-01 10:27:45Z godisch $
 */
 
 #if HAVE_CONFIG_H
@@ -102,7 +102,6 @@
 	break;
 
     case CANCEL_OK:
-	printf( "Message '%s' cancelled.\n", msgId );
 	break;
 
     case CANCEL_NEEDS_MSG:
diff -r 33833f23bc13 -r fd66260b3479 src/post.c
--- a/src/post.c	Sat Mar 29 11:15:36 2003 +0000
+++ b/src/post.c	Tue Apr 01 11:27:45 2003 +0100
@@ -1,7 +1,7 @@
 /*
   post.c
 
-  $Id: post.c 495 2003-03-24 23:32:48Z bears $
+  $Id: post.c 505 2003-04-01 10:27:45Z godisch $
 */
 
 #if HAVE_CONFIG_H
@@ -548,8 +548,7 @@
     }
     else if ( strcasecmp( op, "cancel" ) == 0 )
     {
-	if ( ! controlCancel( Itl_next( article.control ) ) )
-	    return TRUE;	/* Handled entirely locally */
+	controlCancel( Itl_next( article.control ) );
     }
     else
     {