X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/27f19eb43163f6ed613a68986677c840102827ef..dd7b74e90a96eaf109796d8f9499578571a1572c:/src/src/tls.c

diff --git a/src/src/tls.c b/src/src/tls.c
index a3658276f..55295108c 100644
--- a/src/src/tls.c
+++ b/src/src/tls.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2016 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This module provides TLS (aka SSL) support for Exim. The code for OpenSSL is
@@ -87,19 +87,20 @@ return TRUE;
 static uschar *
 to_tz(uschar * tz)
 {
-  uschar * old = US getenv("TZ");
-  setenv("TZ", CS tz, 1);
-  tzset();
-  return old;
+uschar * old = US getenv("TZ");
+(void) setenv("TZ", CCS tz, 1);
+tzset();
+return old;
 }
+
 static void
 restore_tz(uschar * tz)
 {
-  if (tz)
-    setenv("TZ", CS tz, 1);
-  else
-    unsetenv("TZ");
-  tzset();
+if (tz)
+  (void) setenv("TZ", CCS tz, 1);
+else
+  (void) os_unsetenv(US"TZ");
+tzset();
 }
 
 /*************************************************