Module Name: othersrc
Committed By: lukem
Date: Wed Mar 20 09:13:44 UTC 2013
Modified Files:
othersrc/libexec/tnftpd/src: cmds.c extern.h ftpcmd.y ftpd.c
Log Message:
revert
1.14 cmds.c
1.14 extern.h
1.16 ftpcmd.y
1.32 ftpd.c
because it wasn't necessary in tnftpd as these files have been modified
to use "tnftpd.h" instead of the various NetBSD system headers.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 othersrc/libexec/tnftpd/src/cmds.c \
othersrc/libexec/tnftpd/src/extern.h
cvs rdiff -u -r1.16 -r1.17 othersrc/libexec/tnftpd/src/ftpcmd.y
cvs rdiff -u -r1.32 -r1.33 othersrc/libexec/tnftpd/src/ftpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/libexec/tnftpd/src/cmds.c
diff -u othersrc/libexec/tnftpd/src/cmds.c:1.14 othersrc/libexec/tnftpd/src/cmds.c:1.15
--- othersrc/libexec/tnftpd/src/cmds.c:1.14 Wed Mar 6 22:58:31 2013
+++ othersrc/libexec/tnftpd/src/cmds.c Wed Mar 20 09:13:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cmds.c,v 1.14 2013/03/06 22:58:31 christos Exp $ */
+/* $NetBSD: cmds.c,v 1.15 2013/03/20 09:13:44 lukem Exp $ */
/* from NetBSD: cmds.c,v 1.30 2009/03/15 07:48:36 lukem Exp */
/*
@@ -108,6 +108,7 @@ __RCSID(" NetBSD: cmds.c,v 1.30 2009/03/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <tzfile.h>
#include <unistd.h>
#include <ctype.h>
Index: othersrc/libexec/tnftpd/src/extern.h
diff -u othersrc/libexec/tnftpd/src/extern.h:1.14 othersrc/libexec/tnftpd/src/extern.h:1.15
--- othersrc/libexec/tnftpd/src/extern.h:1.14 Wed Mar 6 22:58:31 2013
+++ othersrc/libexec/tnftpd/src/extern.h Wed Mar 20 09:13:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.14 2013/03/06 22:58:31 christos Exp $ */
+/* $NetBSD: extern.h,v 1.15 2013/03/20 09:13:44 lukem Exp $ */
/* from NetBSD: extern.h,v 1.61 2009/07/13 19:05:40 roy Exp */
/*-
@@ -203,13 +203,6 @@ int ftpd_logoutx(const char *, int, int)
# define HAVE_SETPROCTITLE 1
# define HAVE_STRUCT_SOCKADDR_SA_LEN 1
# define HAVE_SOCKADDR_SNPRINTF 1
-# define HAVE_TZFILE_H 1
-#endif
-
-#ifdef HAVE_TZFILE_H
-#include <tzfile.h>
-#else
-#define TM_BASE_YEAR 1900
#endif
struct sockinet {
Index: othersrc/libexec/tnftpd/src/ftpcmd.y
diff -u othersrc/libexec/tnftpd/src/ftpcmd.y:1.16 othersrc/libexec/tnftpd/src/ftpcmd.y:1.17
--- othersrc/libexec/tnftpd/src/ftpcmd.y:1.16 Wed Mar 6 22:58:45 2013
+++ othersrc/libexec/tnftpd/src/ftpcmd.y Wed Mar 20 09:13:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpcmd.y,v 1.16 2013/03/06 22:58:45 christos Exp $ */
+/* $NetBSD: ftpcmd.y,v 1.17 2013/03/20 09:13:44 lukem Exp $ */
/* from NetBSD: ftpcmd.y,v 1.90 2009/07/13 19:05:40 roy Exp */
/*-
@@ -98,6 +98,7 @@ __RCSID(" NetBSD: ftpcmd.y,v 1.90 2009/0
#include <string.h>
#include <syslog.h>
#include <time.h>
+#include <tzfile.h>
#include <unistd.h>
#include <netdb.h>
Index: othersrc/libexec/tnftpd/src/ftpd.c
diff -u othersrc/libexec/tnftpd/src/ftpd.c:1.32 othersrc/libexec/tnftpd/src/ftpd.c:1.33
--- othersrc/libexec/tnftpd/src/ftpd.c:1.32 Wed Mar 6 22:58:31 2013
+++ othersrc/libexec/tnftpd/src/ftpd.c Wed Mar 20 09:13:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpd.c,v 1.32 2013/03/06 22:58:31 christos Exp $ */
+/* $NetBSD: ftpd.c,v 1.33 2013/03/20 09:13:44 lukem Exp $ */
/* from NetBSD: ftpd.c,v 1.194 2009/07/13 19:05:40 roy Exp */
/*
@@ -151,6 +151,7 @@ __RCSID(" NetBSD: ftpd.c,v 1.194 2009/07
#include <string.h>
#include <syslog.h>
#include <time.h>
+#include <tzfile.h>
#include <unistd.h>
#include <util.h>
#ifdef SUPPORT_UTMP
