From 41f8c4f5e46e52a7fc4a8921b64ded0a8a522f28 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 30 Mar 2013 16:36:54 +0100
Subject: [PATCH] Further compiling fixes (issue #17581)

---
 Modules/_ssl.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index bcabd673b38..57a598e4e23 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1207,7 +1207,7 @@ static int PySSL_set_context(PySSLSocket *self, PyObject *value,
 #if !HAVE_SNI
         PyErr_SetString(PyExc_NotImplementedError, "setting a socket's "
                         "context is not supported by your OpenSSL library");
-        return NULL;
+        return -1;
 #else
         Py_INCREF(value);
         Py_DECREF(self->ctx);
@@ -2542,6 +2542,7 @@ set_servername_callback(PySSLContext *self, PyObject *args)
                     "The TLS extension servername callback, "
                     "SSL_CTX_set_tlsext_servername_callback, "
                     "is not in the current OpenSSL library.");
+    return NULL;
 #endif
 }
 
@@ -2574,8 +2575,10 @@ static struct PyMethodDef context_methods[] = {
     {"set_ecdh_curve", (PyCFunction) set_ecdh_curve,
                        METH_O, NULL},
 #endif
+#if HAVE_SNI && !defined(OPENSSL_NO_TLSEXT)
     {"set_servername_callback", (PyCFunction) set_servername_callback,
                     METH_VARARGS, PySSL_set_servername_callback_doc},
+#endif
     {NULL, NULL}        /* sentinel */
 };