Re: [PATCH] imap-send: suppress warning about cleartext password with CRAM-MD5

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 28, 2010, 16:25 UTC
Message-ID: <7vbpe85s7n.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1269702019-27063-1-git-send-email-chris@arachsys.com>

Chris Webb <chris@arachsys.com> writes:

Show 5 quoted lines

> If a CRAM-MD5 challenge-response is used to authenticate to the IMAP server,
> git imap-send shouldn't warn about the password being sent in the clear.
>
> Signed-off-by: Chris Webb <chris@arachsys.com>
> ---

Makes sense.  Thanks.

Show 29 quoted lines

>  imap-send.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/imap-send.c b/imap-send.c
> index aeb2985..7107923 100644
> --- a/imap-send.c
> +++ b/imap-send.c
> @@ -1226,9 +1226,6 @@ static struct store *imap_open_store(struct imap_server_conf *srvc)
>  			fprintf(stderr, "Skipping account %s@%s, server forbids LOGIN\n", srvc->user, srvc->host);
>  			goto bail;
>  		}
> -		if (!imap->buf.sock.ssl)
> -			imap_warn("*** IMAP Warning *** Password is being "
> -				  "sent in the clear\n");
>  
>  		if (srvc->auth_method) {
>  			struct imap_cmd_cb cb;
> @@ -1253,6 +1250,9 @@ static struct store *imap_open_store(struct imap_server_conf *srvc)
>  				goto bail;
>  			}
>  		} else {
> +			if (!imap->buf.sock.ssl)
> +				imap_warn("*** IMAP Warning *** Password is being "
> +					  "sent in the clear\n");
>  			if (imap_exec(ctx, NULL, "LOGIN \"%s\" \"%s\"", srvc->user, srvc->pass) != RESP_OK) {
>  				fprintf(stderr, "IMAP error: LOGIN failed\n");
>  				goto bail;
> -- 
> 1.7.0.1