Index: ChangeLog
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/ChangeLog,v
retrieving revision 6.2420
diff -u -r6.2420 ChangeLog
--- ChangeLog	10 Jun 2003 17:16:51 -0000	6.2420
+++ ChangeLog	12 Jun 2003 18:34:56 -0000
@@ -1,3 +1,9 @@
+	* message.el (message-is-yours-p): New function.  Separated common
+	code from message-cancel-news and message-supersede.  Added
+	matching code which uses message-alternative-emails regexp as last
+	resort.
+	(message-cancel-news, message-supersede): Use message-is-yours-p.
+
 2003-06-10  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* spam.el (spam-check-bogofilter-headers): fix for when the score
Index: message.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/message.el,v
retrieving revision 6.350
diff -u -r6.350 message.el
--- message.el	8 Jun 2003 22:17:05 -0000	6.350
+++ message.el	12 Jun 2003 18:34:58 -0000
@@ -5702,6 +5702,45 @@
 
      cur)))
 
+;;;###autoload
+(defun message-is-yours-p ()
+  "Non-nil means current article is yours.
+If you have added 'cancel-messages to 'message-shoot-gnksa-feet', all articles
+are yours except those that have Cancel-Lock header not belonging to you.
+Instead of shooting GNKSA feet, you should modify 'message-alternative-emails'
+regexp to match all of yours addresses."
+  ;; Canlock-logic as suggested by Per Abrahamsen
+  ;; <abraham@dina.kvl.dk>
+  ;;
+  ;; IF article has cancel-lock THEN
+  ;;   IF we can verify it THEN
+  ;;     issue cancel
+  ;;   ELSE
+  ;;     error: cancellock: article is not yours
+  ;; ELSE
+  ;;   Use old rules, comparing sender...
+  (if (message-fetch-field "Cancel-Lock")
+      (if (null (canlock-verify))
+	  t
+	(error "Failed to verify Cancel-lock: This article is not yours"))
+    (or
+     (message-gnksa-enable-p 'cancel-messages)
+     (and sender
+	  (string-equal
+	   (downcase sender)
+	   (downcase (message-make-sender))))
+     ;; Email address in From field equals to our address
+     (string-equal
+      (downcase (cadr (mail-extract-address-components from)))
+      (downcase (cadr (mail-extract-address-components
+		       (message-make-from)))))
+     ;; Email address in From field matches
+     ;; 'message-alternative-emails' regexp
+     (and message-alternative-emails
+	  (string-match
+	   message-alternative-emails
+	   (cadr (mail-extract-address-components from)))))))
+
 
 ;;;###autoload
 (defun message-cancel-news (&optional arg)
@@ -5721,31 +5760,7 @@
 	      message-id (message-fetch-field "message-id" t)
 	      distribution (message-fetch-field "distribution")))
       ;; Make sure that this article was written by the user.
-      (unless (or
-	       ;; Canlock-logic as suggested by Per Abrahamsen
-	       ;; <abraham@dina.kvl.dk>
-	       ;;
-	       ;; IF article has cancel-lock THEN
-	       ;;   IF we can verify it THEN
-	       ;;     issue cancel
-	       ;;   ELSE
-	       ;;     error: cancellock: article is not yours
-	       ;; ELSE
-	       ;;   Use old rules, comparing sender...
-	       (if (message-fetch-field "Cancel-Lock")
-		   (if (null (canlock-verify))
-		       t
-		     (error "Failed to verify Cancel-lock: This article is not yours"))
-		 nil)
-	       (message-gnksa-enable-p 'cancel-messages)
-	       (and sender
-		    (string-equal
-		     (downcase sender)
-		     (downcase (message-make-sender))))
-	       (string-equal
-		(downcase (cadr (mail-extract-address-components from)))
-		(downcase (cadr (mail-extract-address-components
-				 (message-make-from))))))
+      (unless (message-is-yours-p)
 	(error "This article is not yours"))
       (when (yes-or-no-p "Do you really want to cancel this article? ")
 	;; Make control message.
@@ -5781,31 +5796,7 @@
 	(sender (message-fetch-field "sender"))
 	(from (message-fetch-field "from")))
     ;; Check whether the user owns the article that is to be superseded.
-    (unless (or
-	     ;; Canlock-logic as suggested by Per Abrahamsen
-	     ;; <abraham@dina.kvl.dk>
-	     ;;
-	     ;; IF article has cancel-lock THEN
-	     ;;   IF we can verify it THEN
-	     ;;     issue cancel
-	     ;;   ELSE
-	     ;;     error: cancellock: article is not yours
-	     ;; ELSE
-	     ;;   Use old rules, comparing sender...
-	     (if (message-fetch-field "Cancel-Lock")
-		 (if (null (canlock-verify))
-		     t
-		   (error "Failed to verify Cancel-lock: This article is not yours"))
-	       nil)
-	     (message-gnksa-enable-p 'cancel-messages)
-		(and sender
-		     (string-equal
-		      (downcase sender)
-		      (downcase (message-make-sender))))
-		(string-equal
-		 (downcase (cadr (mail-extract-address-components from)))
-		 (downcase (cadr (mail-extract-address-components
-				  (message-make-from))))))
+    (unless (message-is-yours-p)
       (error "This article is not yours"))
     ;; Get a normal message buffer.
     (message-pop-to-buffer (message-buffer-name "supersede"))