View | Details | Raw Unified | Return to bug 256968
Collapse All | Expand All

(-)b/security/nmap/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	nmap
3
PORTNAME=	nmap
4
DISTVERSION=	7.91
4
DISTVERSION=	7.91
5
PORTREVISION=	0
5
PORTREVISION=	1
6
CATEGORIES=	security
6
CATEGORIES=	security
7
MASTER_SITES=	https://nmap.org/dist/ \
7
MASTER_SITES=	https://nmap.org/dist/ \
8
		LOCAL/ohauer
8
		LOCAL/ohauer
(-)b/security/nmap/files/patch-ncat_ncat__connect.c (+28 lines)
Added Link Here
1
From 169d7e5a922ef8e63b51ee2bdf4fd4ad60ed2689 Mon Sep 17 00:00:00 2001
2
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
3
Date: Thu, 19 Nov 2020 17:34:24 +0000
4
Subject: [PATCH] Restore call to post_connect in non-ssl case. Fixes #2149
5
6
--- ncat/ncat_connect.c.orig	2020-10-02 16:12:22 UTC
7
+++ ncat/ncat_connect.c
8
@@ -1064,12 +1064,17 @@ int ncat_connect(void)
9
             bye("Failed to set hostname on iod.");
10
         if (o.ssl)
11
         {
12
+            /* connect_handler creates stdin_nsi and calls post_connect */
13
             nsock_reconnect_ssl(mypool, cs.sock_nsi, connect_handler, o.conntimeout, NULL, NULL);
14
         }
15
+        else
16
+        {
17
+            /* Create IOD for nsp->stdin */
18
+            if ((cs.stdin_nsi = nsock_iod_new2(mypool, 0, NULL)) == NULL)
19
+                bye("Failed to create stdin nsiod.");
20
 
21
-        /* Create IOD for nsp->stdin */
22
-        if ((cs.stdin_nsi = nsock_iod_new2(mypool, 0, NULL)) == NULL)
23
-            bye("Failed to create stdin nsiod.");
24
+            post_connect(mypool, cs.sock_nsi);
25
+        }
26
     }
27
 
28
     /* connect */

Return to bug 256968