* message.el (message-is-yours-p): Allow disabling canlock checking

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 872cdc1..03b6808 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-08-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * message.el (message-is-yours-p): Allow disabling canlock checking
+       (bug#9295).
+       (message-shoot-gnksa-feet): Add `canlock-verify'.
+
        * auth-source.el (auth-source-netrc-saver): Make the .authinfo file
        non-world-readable.
 

diff --git a/lisp/message.el b/lisp/message.el
index a0ee4c3..313ddb4 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1397,7 +1397,8 @@ candidates:
 `quoted-text-only'  Allow you to post quoted text only;
 `multiple-copies'   Allow you to post multiple copies;
 `cancel-messages'   Allow you to cancel or supersede messages from
-                   your other email addresses.")
+                   your other email addresses;
+`canlock-verify'    Allow you to cancel messages without verifying canlock.")
 
 (defsubst message-gnksa-enable-p (feature)
   (or (not (listp message-shoot-gnksa-feet))
@@ -7081,7 +7082,8 @@ regexp to match all of yours addresses."
   (save-excursion
     (save-restriction
       (message-narrow-to-head-1)
-      (if (message-fetch-field "Cancel-Lock")
+      (if (and (message-fetch-field "Cancel-Lock")
+              (message-gnksa-enable-p 'canlock-verify))
          (if (null (canlock-verify))
              t
            (error "Failed to verify Cancel-lock: This article is not yours"))