>From aa2f31e0da53905c1254dc5eef891e31aeaef495 Mon Sep 17 00:00:00 2001
From: Markus Klinik <markus.klinik () gmx de>
Date: Sat, 27 Feb 2010 12:53:16 +0100
Subject: [PATCH 8/8] ncat_main: forbid proxy-server mode and telnet


diff --git a/ncat_main.c b/ncat_main.c
index 9303d1d..1aa2b34 100644
--- a/ncat_main.c
+++ b/ncat_main.c
@@ -723,6 +723,9 @@ static int ncat_listen_mode(void) {
     if (o.broker && o.cmdexec != NULL)
         bye("Invalid option combination: --broker and -e.");
 
+    if (o.proxytype != NULL && o.telnet)
+        bye("Invalid option combination: --proxy-type and --telnet.");
+
     /* Set the default maximum simultaneous TCP connection limit. */
     if (o.conn_limit == -1)
         o.conn_limit = DEFAULT_MAX_CONNS;
-- 
1.6.6.1