[PATCH 2 of 6] mail: remove redundant call to SSL socket validator

Julien Cristau jcristau at debian.org
Mon Mar 28 14:58:20 EDT 2016


On Sun, Mar 27, 2016 at 23:21:31 -0700, Gregory Szorc wrote:

> @@ -129,17 +139,16 @@ def _smtp(ui):
>      s.connect(host=mailhost, port=mailport)
>      if starttls:
>          ui.note(_('(using starttls)\n'))
>          s.ehlo()
>          s.starttls()
>          s.ehlo()
>      if (starttls or smtps) and verifycert:
>          ui.note(_('(verifying remote certificate)\n'))
> -        sslutil.validator(ui, mailhost)(s.sock, verifycert == 'strict')

This ui.note becomes a bit of a lie, since the verification is now done
at connect or starttls time.  Maybe just remove the block?

Cheers,
Julien


More information about the Mercurial-devel mailing list