Skip to content

Commit

Permalink
imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available
Browse files Browse the repository at this point in the history
This fixes the compilation on an older Linux that was used to debug
test failures when upgrading Git for Windows to Git v2.3.0.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Johannes Schindelin authored and Junio C Hamano committed Oct 26, 2015
1 parent a2558fb commit 71d9257
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions imap-send.c
Original file line number Diff line number Diff line change
Expand Up @@ -1422,11 +1422,15 @@ static CURL *setup_curl(struct imap_server_conf *srvc)
curl_easy_setopt(curl, CURLOPT_PORT, server.port);

if (server.auth_method) {
#if LIBCURL_VERSION_NUM < 0x072200
warning("No LOGIN_OPTIONS support in this cURL version");
#else
struct strbuf auth = STRBUF_INIT;
strbuf_addstr(&auth, "AUTH=");
strbuf_addstr(&auth, server.auth_method);
curl_easy_setopt(curl, CURLOPT_LOGIN_OPTIONS, auth.buf);
strbuf_release(&auth);
#endif
}

if (!server.use_ssl)
Expand Down

0 comments on commit 71d9257

Please sign in to comment.