summaryrefslogtreecommitdiffstats
path: root/libexec
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>1998-05-15 16:08:52 +0000
committerache <ache@FreeBSD.org>1998-05-15 16:08:52 +0000
commit89d157849226c8b3496238c8e116bd0060e69234 (patch)
treec4b2d3107f981c37d7a0a58af24a912790e5c98b /libexec
parent9ab1a03565092c91cb96689a923dbd1865fa9bc3 (diff)
downloadFreeBSD-src-89d157849226c8b3496238c8e116bd0060e69234.zip
FreeBSD-src-89d157849226c8b3496238c8e116bd0060e69234.tar.gz
Move TZ="" assignment just before exec to not touch other time stuff
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ftpd/ftpd.c5
-rw-r--r--libexec/ftpd/popen.c4
2 files changed, 4 insertions, 5 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 9e3b40d..41713e4 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -44,7 +44,7 @@ static char copyright[] =
static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94";
#endif
static const char rcsid[] =
- "$Id: ftpd.c,v 1.46 1998/04/28 03:37:23 dg Exp $";
+ "$Id: ftpd.c,v 1.47 1998/05/15 15:06:58 ache Exp $";
#endif /* not lint */
/*
@@ -273,9 +273,6 @@ main(argc, argv, envp)
char *cp, line[LINE_MAX];
FILE *fd;
- setenv("TZ", "", 1); /* since protocol have no way to tell offset */
- tzset();
-
#ifdef OLD_SETPROCTITLE
/*
* Save start and extent of argv for setproctitle.
diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c
index 4996c25..d8b91cd 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -39,7 +39,7 @@
static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94";
#endif
static const char rcsid[] =
- "$Id: popen.c,v 1.10 1998/02/25 07:10:57 danny Exp $";
+ "$Id: popen.c,v 1.11 1998/04/27 10:51:26 dg Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -145,6 +145,8 @@ ftpd_popen(program, type)
}
(void)close(pdes[1]);
}
+ /* since FTP protocol have no way to tell zone offset */
+ setenv("TZ", "", 1);
#ifdef INTERNAL_LS
if (strcmp(gargv[0], _PATH_LS) == 0) {
extern int optreset;
OpenPOWER on IntegriCloud