From 5edd64c849ec45aa04d45a1c634775c71108e04b Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Thu, 24 Mar 2016 17:37:27 -0400
Subject: [PATCH] embryo: don't mess with env vars in tzdate if no tz is passed

---
 src/lib/embryo/embryo_time.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/lib/embryo/embryo_time.c b/src/lib/embryo/embryo_time.c
index e8b481e350..ce167cb4ff 100644
--- a/src/lib/embryo/embryo_time.c
+++ b/src/lib/embryo/embryo_time.c
@@ -107,7 +107,7 @@ _embryo_time_tzdate(Embryo_Program *ep, Embryo_Cell *params)
    tzenv = getenv("TZ");
    if (tzenv)
      strncpy(prevtz, tzenv, sizeof(prevtz) - 1);
-   if (tz)
+   if (tz && tz[0])
      {
         setenv("TZ", tz, 1);
         tzset();
@@ -115,11 +115,14 @@ _embryo_time_tzdate(Embryo_Program *ep, Embryo_Cell *params)
    gettimeofday(&timev, NULL);
    tt = (time_t)(timev.tv_sec);
    tm = localtime(&tt);
-   if (prevtz[0])
-     setenv("TZ", prevtz, 1);
-   else
-     unsetenv("TZ");
-   tzset();
+   if (tz && tz[0])
+     {
+        if (prevtz[0])
+          setenv("TZ", prevtz, 1);
+        else
+          unsetenv("TZ");
+        tzset();
+     }
    if (tm)
      {
         Embryo_Cell *cptr;