aboutsummaryrefslogtreecommitdiff
path: root/patches/netcat.c.patch
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2015-11-02 20:22:26 -0600
committerBrent Cook <bcook@openbsd.org>2015-11-02 20:22:26 -0600
commit1d5dfff695d7bfb32521f4f8c7c296e27b18e908 (patch)
tree0b31b0444b8f39d47d338a9cf3e9f3d93da0f579 /patches/netcat.c.patch
parent7180bed3bb78144e19c1dfe3180b0dd2f426bf60 (diff)
downloadportable-1d5dfff695d7bfb32521f4f8c7c296e27b18e908.tar.gz
portable-1d5dfff695d7bfb32521f4f8c7c296e27b18e908.tar.bz2
portable-1d5dfff695d7bfb32521f4f8c7c296e27b18e908.zip
update patches
Diffstat (limited to 'patches/netcat.c.patch')
-rw-r--r--patches/netcat.c.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/netcat.c.patch b/patches/netcat.c.patch
index 36278d9..fffd726 100644
--- a/patches/netcat.c.patch
+++ b/patches/netcat.c.patch
@@ -1,5 +1,5 @@
1--- apps/nc/netcat.c.orig 2015-10-23 16:01:14.000000000 -0700 1--- apps/nc/netcat.c.orig Mon Nov 2 20:00:31 2015
2+++ apps/nc/netcat.c 2015-10-23 16:17:08.000000000 -0700 2+++ apps/nc/netcat.c Mon Nov 2 20:00:39 2015
3@@ -57,6 +57,10 @@ 3@@ -57,6 +57,10 @@
4 #include <tls.h> 4 #include <tls.h>
5 #include "atomicio.h" 5 #include "atomicio.h"
@@ -80,7 +80,7 @@
80 if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1) 80 if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1)
81 err(1, "pledge"); 81 err(1, "pledge");
82 } 82 }
83@@ -797,7 +811,10 @@ 83@@ -798,7 +812,10 @@
84 remote_connect(const char *host, const char *port, struct addrinfo hints) 84 remote_connect(const char *host, const char *port, struct addrinfo hints)
85 { 85 {
86 struct addrinfo *res, *res0; 86 struct addrinfo *res, *res0;
@@ -92,7 +92,7 @@
92 92
93 if ((error = getaddrinfo(host, port, &hints, &res))) 93 if ((error = getaddrinfo(host, port, &hints, &res)))
94 errx(1, "getaddrinfo: %s", gai_strerror(error)); 94 errx(1, "getaddrinfo: %s", gai_strerror(error));
95@@ -808,16 +825,20 @@ 95@@ -809,16 +826,20 @@
96 SOCK_NONBLOCK, res0->ai_protocol)) < 0) 96 SOCK_NONBLOCK, res0->ai_protocol)) < 0)
97 continue; 97 continue;
98 98
@@ -113,7 +113,7 @@
113 memset(&ahints, 0, sizeof(struct addrinfo)); 113 memset(&ahints, 0, sizeof(struct addrinfo));
114 ahints.ai_family = res0->ai_family; 114 ahints.ai_family = res0->ai_family;
115 ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; 115 ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
116@@ -886,7 +907,10 @@ 116@@ -887,7 +908,10 @@
117 local_listen(char *host, char *port, struct addrinfo hints) 117 local_listen(char *host, char *port, struct addrinfo hints)
118 { 118 {
119 struct addrinfo *res, *res0; 119 struct addrinfo *res, *res0;
@@ -125,7 +125,7 @@
125 int error; 125 int error;
126 126
127 /* Allow nodename to be null. */ 127 /* Allow nodename to be null. */
128@@ -908,13 +932,17 @@ 128@@ -909,13 +933,17 @@
129 res0->ai_protocol)) < 0) 129 res0->ai_protocol)) < 0)
130 continue; 130 continue;
131 131