diff --git a/default/scenari/send.publickey b/default/scenari/send.publickey index d20667417..cb92118c8 100644 --- a/default/scenari/send.publickey +++ b/default/scenari/send.publickey @@ -1,4 +1,4 @@ -title.gettext anyone no authentication if DKIM signature is OK +title.gettext need authentication true() smtp -> request_auth true() md5,smime -> do_it diff --git a/doc/sympa_scenario.pod b/doc/sympa_scenario.pod index dfaea5763..79aa06aa6 100644 --- a/doc/sympa_scenario.pod +++ b/doc/sympa_scenario.pod @@ -219,10 +219,6 @@ If it is not given, 'C' will be set. Default method. No actual authentication, and if any, sender of the message is used. -=item C - -Authenticated by DKIM signature. - =item C Authenticated by web authentication (password), @@ -235,6 +231,10 @@ or TLS client certificate. =back +Note: +The C authentication method for scenarios was obsoleted +on Sympa 6.2.71b.1. Now it is a synonym of C method. + =head3 Actions An action consists of an action name and optional modifiers. diff --git a/src/lib/Sympa/ListOpt.pm b/src/lib/Sympa/ListOpt.pm index 6018bbe90..96cb28388 100644 --- a/src/lib/Sympa/ListOpt.pm +++ b/src/lib/Sympa/ListOpt.pm @@ -196,7 +196,7 @@ our %list_option = ( 'smime_authenticated_messages' => {'gettext_id' => 'authenticated by S/MIME signature'}, 'dkim_authenticated_messages' => - {'gettext_id' => 'authenticated by DKIM signature'}, + {'gettext_id' => 'with successfully verified DKIM signature'}, 'editor_validated_messages' => {'gettext_id' => 'approved by moderator'}, 'any' => {'gettext_id' => 'any messages'},