Module Name: othersrc
Committed By: lukem
Date: Fri Aug 27 01:48:01 UTC 2021
Modified Files:
othersrc/usr.bin/tnftp/src: Makefile.am ssl.c
Log Message:
Always build ssl.c even if !WITH_SSL
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 othersrc/usr.bin/tnftp/src/Makefile.am \
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/Makefile.am
diff -u othersrc/usr.bin/tnftp/src/Makefile.am:1.6 othersrc/usr.bin/tnftp/src/Makefile.am:1.7
--- othersrc/usr.bin/tnftp/src/Makefile.am:1.6 Sun Apr 25 09:29:43 2021
+++ othersrc/usr.bin/tnftp/src/Makefile.am Fri Aug 27 01:48:01 2021
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.6 2021/04/25 09:29:43 lukem Exp $
+## $NetBSD: Makefile.am,v 1.7 2021/08/27 01:48:01 lukem Exp $
bin_PROGRAMS = tnftp
@@ -12,6 +12,7 @@ tnftp_SOURCES = \
main.c \
progressbar.c \
ruserpass.c \
+ ssl.c \
util.c
tnftp_CPPFLAGS = \
@@ -40,9 +41,6 @@ endif # !OPT_EDITCOMPLETE
if WITH_SSL
-tnftp_SOURCES += \
- ssl.c
-
tnftp_CPPFLAGS += \
$(OPENSSL_INCLUDES)
Index: othersrc/usr.bin/tnftp/src/ssl.c
diff -u othersrc/usr.bin/tnftp/src/ssl.c:1.6 othersrc/usr.bin/tnftp/src/ssl.c:1.7
--- othersrc/usr.bin/tnftp/src/ssl.c:1.6 Fri Aug 27 01:38:49 2021
+++ othersrc/usr.bin/tnftp/src/ssl.c Fri Aug 27 01:48:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ssl.c,v 1.6 2021/08/27 01:38:49 lukem Exp $ */
+/* $NetBSD: ssl.c,v 1.7 2021/08/27 01:48:01 lukem Exp $ */
/* from NetBSD: ssl.c,v 1.10 2021/06/03 10:23:33 lukem Exp */
/*-
@@ -58,6 +58,8 @@ __RCSID(" NetBSD: ssl.c,v 1.10 2021/06/0
#include <netinet/tcp.h>
#include <netinet/in.h>
+#endif /* tnftp */
+
#ifdef WITH_SSL
#include <openssl/crypto.h>
#include <openssl/x509.h>
@@ -66,8 +68,6 @@ __RCSID(" NetBSD: ssl.c,v 1.10 2021/06/0
#include <openssl/err.h>
#endif
-#endif /* tnftp */
-
#include "ssl.h"
extern int quit_time, verbose, ftp_debug;
