DKIM: reinstate embedded Polarssl SHA routines under older GnuTLS. Bug 1772

[user/henk/code/exim.git] / src / src / tls.c

diff --git a/src/src/tls.c b/src/src/tls.c
index 60f0cfe986f6ff1e184d78644ba4a3756a66a5a3..5958dfc1c115648beec667046c801847e5ece08c 100644 (file)
--- a/src/src/tls.c
+++ b/src/src/tls.c
@@ -84,22 +84,26 @@ return TRUE;
 *        Timezone environment flipping           *
 *************************************************/
 
+#ifdef MISSING_UNSETENV_3
+# include "setenv.c"
+#endif
+
 static uschar *
 to_tz(uschar * tz)
 {
   uschar * old = US getenv("TZ");
-  setenv("TZ", CS tz, 1);
-  tzset();
+  (void) setenv("TZ", CCS tz, 1);
+  tzset(); 
   return old;
 }
 static void
 restore_tz(uschar * tz)
 {
   if (tz)
-    setenv("TZ", CS tz, 1);
+    (void) setenv("TZ", CCS tz, 1);
   else
-    unsetenv("TZ");
-  tzset();
+    (void) unsetenv("TZ");
+  tzset(); 
 }
 
 /*************************************************
@@ -107,18 +111,18 @@ restore_tz(uschar * tz)
 *************************************************/
 
 #ifdef USE_GNUTLS
-#include "tls-gnu.c"
-#include "tlscert-gnu.c"
+# include "tls-gnu.c"
+# include "tlscert-gnu.c"
 
-#define ssl_xfer_buffer (state_server.xfer_buffer)
-#define ssl_xfer_buffer_lwm (state_server.xfer_buffer_lwm)
-#define ssl_xfer_buffer_hwm (state_server.xfer_buffer_hwm)
-#define ssl_xfer_eof (state_server.xfer_eof)
-#define ssl_xfer_error (state_server.xfer_error)
+# define ssl_xfer_buffer (state_server.xfer_buffer)
+# define ssl_xfer_buffer_lwm (state_server.xfer_buffer_lwm)
+# define ssl_xfer_buffer_hwm (state_server.xfer_buffer_hwm)
+# define ssl_xfer_eof (state_server.xfer_eof)
+# define ssl_xfer_error (state_server.xfer_error)
 
 #else
-#include "tls-openssl.c"
-#include "tlscert-openssl.c"
+# include "tls-openssl.c"
+# include "tlscert-openssl.c"
 #endif