Merge branch 'fix-2016-dkim'

[exim.git] / src / src / tls.c

diff --git a/src/src/tls.c b/src/src/tls.c
index 0406a10f98787f72caabb8a54983141ad43e2dbc..f34cf632182c52f6ebb335db36600d55015bc261 100644 (file)
--- a/src/src/tls.c
+++ b/src/src/tls.c
@@ -2,13 +2,13 @@
 *     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
 based on a patch that was originally contributed by Steve Haslam. It was
 adapted from stunnel, a GPL program by Michal Trojnara. The code for GNU TLS is
-based on a patch contributed by Nikos Mavroyanopoulos. Because these packages
+based on a patch contributed by Nikos Mavrogiannopoulos. Because these packages
 are so very different, the functions for each are kept in separate files. The
 relevant file is #included as required, after any any common functions.
 
@@ -89,7 +89,7 @@ to_tz(uschar * tz)
 {
 uschar * old = US getenv("TZ");
 (void) setenv("TZ", CCS tz, 1);
-tzset(); 
+tzset();
 return old;
 }
 
@@ -99,8 +99,8 @@ restore_tz(uschar * tz)
 if (tz)
   (void) setenv("TZ", CCS tz, 1);
 else
-  (void) unsetenv("TZ");
-tzset(); 
+  (void) os_unsetenv(US"TZ");
+tzset();
 }
 
 /*************************************************