File git-CVE-2013-0308-imap-send-move-ifdef-around.patch of Package git

From 41b978d2e07232c21a30a4b2f055afdd245b0ea5 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Feb 2013 12:32:19 -0800
Subject: [PATCH v3 1/3] imap-send: move #ifdef around

Instead of adding an early return to the inside of the
ssl_socket_connect() function for NO_OPENSSL compilation, split it
into a separate stub function.

No functional change, but the next change to extend ssl_socket_connect()
will become easier to read this way.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 imap-send.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- git-1.6.4.2/imap-send.c.orig	2013-02-26 12:24:26.478813018 +0100
+++ git-1.6.4.2/imap-send.c	2013-02-26 12:25:41.118457839 +0100
@@ -267,12 +267,15 @@
 	}
 }
 
+#ifdef NO_OPENSSL
 static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int verify)
 {
-#ifdef NO_OPENSSL
 	fprintf(stderr, "SSL requested but SSL support not compiled in\n");
 	return -1;
+}
 #else
+static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int verify)
+{
 	SSL_METHOD *meth;
 	SSL_CTX *ctx;
 	int ret;
@@ -316,8 +319,8 @@
 	}
 
 	return 0;
-#endif
 }
+#endif
 
 static int socket_read(struct imap_socket *sock, char *buf, int len)
 {