summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/appl/bsd/ChangeLog6
-rw-r--r--src/appl/bsd/krshd.c17
2 files changed, 21 insertions, 2 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 7d121ffe8..baf390dd9 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,9 @@
+Sun Nov 12 04:44:50 1995 Mark W. Eichin <eichin@cygnus.com>
+
+ * krshd.c (doit): drag TZ= from parent environment into envinit to
+ pass to child.
+ (envinit, TZENV): add one more slot for optional TZ, and mark it.
+
Thu Nov 2 16:16:47 1995 Ezra Peisach <epeisach@kangaroo.mit.edu>
* krlogin.c, krcp.c, krsh.c (main): If invoked with -D port, do
diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index fae360648..eb760fc13 100644
--- a/src/appl/bsd/krshd.c
+++ b/src/appl/bsd/krshd.c
@@ -442,10 +442,12 @@ char *getenv();
#else /* CRAY */
#ifdef KERBEROS
char *envinit[] =
-{homedir, shell, 0, username, term, 0};
+{homedir, shell, 0, username, term, 0, 0};
+#define TZENV 5
#else /* KERBEROS */
char *envinit[] =
-{homedir, shell, 0, username, term, 0};
+{homedir, shell, 0, username, term, 0, 0};
+#define TZENV 5
#endif /* KERBEROS */
#endif /* CRAY */
@@ -1229,6 +1231,17 @@ doit(f, fromp)
}
#endif
(void) setuid((uid_t)pwd->pw_uid);
+ /* if TZ is set in the parent, drag it in */
+ {
+ char **findtz = environ;
+ while(*findtz) {
+ if(!strncmp(*findtz,"TZ=",3)) {
+ envinit[TZENV] = *findtz;
+ break;
+ }
+ findtz++;
+ }
+ }
environ = envinit;
strncat(homedir, pwd->pw_dir, sizeof(homedir)-6);
strncat(shell, pwd->pw_shell, sizeof(shell)-7);