Module Name: othersrc
Committed By: lukem
Date: Sun Apr 9 06:17:55 UTC 2023
Modified Files:
othersrc/usr.bin/tnftp/src: ssl.c
Log Message:
ssl.c: sync from upstream 1.14
Simplify includes
Include "ftp_var.h" instead of various system headers and "extern.h"
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 othersrc/usr.bin/tnftp/src/ssl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/src/ssl.c
diff -u othersrc/usr.bin/tnftp/src/ssl.c:1.8 othersrc/usr.bin/tnftp/src/ssl.c:1.9
--- othersrc/usr.bin/tnftp/src/ssl.c:1.8 Sun Apr 9 00:56:07 2023
+++ othersrc/usr.bin/tnftp/src/ssl.c Sun Apr 9 06:17:55 2023
@@ -1,5 +1,5 @@
-/* $NetBSD: ssl.c,v 1.8 2023/04/09 00:56:07 lukem Exp $ */
-/* from NetBSD: ssl.c,v 1.13 2023/02/25 12:07:25 mlelstv Exp */
+/* $NetBSD: ssl.c,v 1.9 2023/04/09 06:17:55 lukem Exp $ */
+/* from NetBSD: ssl.c,v 1.14 2023/04/09 06:10:03 lukem Exp */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID(" NetBSD: ssl.c,v 1.13 2023/02/25 12:07:25 mlelstv Exp ");
+__RCSID(" NetBSD: ssl.c,v 1.14 2023/04/09 06:10:03 lukem Exp ");
#endif
#include <errno.h>
@@ -70,11 +70,7 @@ __RCSID(" NetBSD: ssl.c,v 1.13 2023/02/2
#endif
#include "ssl.h"
-
-#include <stringlist.h>
-#include <histedit.h>
-#include <sys/poll.h>
-#include "extern.h"
+#include "ftp_var.h"
extern int quit_time, verbose, ftp_debug;
extern FILE *ttyout;
