[src/trunk]: src/usr.bin/nc the tls ifdef was a bit too aggressive.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1d86ee38cc7e
branches:  trunk
changeset: 821565:1d86ee38cc7e
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Feb 09 17:27:30 2017 +0000

description:
the tls ifdef was a bit too aggressive.

diffstat:

 usr.bin/nc/netcat.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 96ca069742ed -r 1d86ee38cc7e usr.bin/nc/netcat.c
--- a/usr.bin/nc/netcat.c       Thu Feb 09 15:24:08 2017 +0000
+++ b/usr.bin/nc/netcat.c       Thu Feb 09 17:27:30 2017 +0000
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: netcat.c,v 1.2 2017/02/06 16:03:40 christos Exp $");
+__RCSID("$NetBSD: netcat.c,v 1.3 2017/02/09 17:27:30 christos Exp $");
 
 /*
  * Re-written nc(1) for OpenBSD. Original implementation by
@@ -709,8 +709,8 @@
                        }
                        if (Fflag)
                                fdpass(s);
+                       else {
 #ifdef CRYPTO
-                       else {
                                if (usetls)
                                        tls_setup_client(tls_ctx, s, host);
                                if (!zflag)
@@ -725,8 +725,11 @@
                                        tls_free(tls_ctx);
                                        tls_ctx = NULL;
                                }
+#else
+                               if (!zflag)
+                                       readwrite(s, NULL);
+#endif
                        }
-#endif
                }
        }