update netcat patch

This commit is contained in:
Brent Cook 2019-11-30 03:50:54 -06:00
parent 77216eec7a
commit da75637d83

View File

@ -1,5 +1,5 @@
--- apps/nc/netcat.c.orig Sun Oct 27 09:22:15 2019
+++ apps/nc/netcat.c Sun Oct 27 09:24:17 2019
--- apps/nc/netcat.c.orig Mon Nov 18 01:13:56 2019
+++ apps/nc/netcat.c Sat Nov 30 03:29:50 2019
@@ -93,9 +93,13 @@
int Dflag; /* sodebug */
int Iflag; /* TCP receive buffer size */
@ -52,7 +52,7 @@
+#endif
/* Cruft to make sure options are clean, and used properly. */
if (argv[0] && !argv[1] && family == AF_UNIX) {
if (argc == 1 && family == AF_UNIX) {
@@ -926,7 +936,10 @@
char *ipaddr)
{
@ -76,7 +76,7 @@
memset(&ahints, 0, sizeof(struct addrinfo));
ahints.ai_family = res->ai_family;
ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
@@ -1028,7 +1043,10 @@
@@ -1034,7 +1049,10 @@
local_listen(const char *host, const char *port, struct addrinfo hints)
{
struct addrinfo *res, *res0;
@ -88,7 +88,7 @@
int error;
/* Allow nodename to be null. */
@@ -1049,9 +1067,11 @@
@@ -1055,9 +1073,11 @@
res->ai_protocol)) == -1)
continue;
@ -100,7 +100,7 @@
set_common_sockopts(s, res->ai_family);
@@ -1521,11 +1541,13 @@
@@ -1555,11 +1575,13 @@
{
int x = 1;
@ -114,7 +114,7 @@
if (Dflag) {
if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
&x, sizeof(x)) == -1)
@@ -1536,9 +1558,16 @@
@@ -1570,9 +1592,16 @@
IP_TOS, &Tflag, sizeof(Tflag)) == -1)
err(1, "set IP ToS");
@ -131,7 +131,7 @@
}
if (Iflag) {
if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
@@ -1562,13 +1591,17 @@
@@ -1596,13 +1625,17 @@
}
if (minttl != -1) {
@ -150,7 +150,7 @@
}
}
@@ -1790,14 +1823,22 @@
@@ -1824,14 +1857,22 @@
\t-P proxyuser\tUsername for proxy authentication\n\
\t-p port\t Specify local port for remote connects\n\
\t-R CAfile CA bundle\n\