diff options
Diffstat (limited to 'mail/sendmail/patches/patch-ar')
| -rw-r--r-- | mail/sendmail/patches/patch-ar | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/mail/sendmail/patches/patch-ar b/mail/sendmail/patches/patch-ar index ee48215dd8b..87952b69e8f 100644 --- a/mail/sendmail/patches/patch-ar +++ b/mail/sendmail/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.2 2019/07/15 04:32:49 jnemeth Exp $ +$NetBSD: patch-ar,v 1.3 2021/07/04 07:57:13 jnemeth Exp $ ---- sendmail/daemon.c.orig 2015-02-28 00:50:03.000000000 +0000 +--- sendmail/daemon.c.orig 2020-06-02 09:41:43.000000000 +0000 +++ sendmail/daemon.c -@@ -57,6 +57,10 @@ SM_RCSID("@(#)$Id: daemon.c,v 8.698 2013 +@@ -75,6 +75,10 @@ SM_RCSID("@(#)$Id: daemon.c,v 8.698 2013 # endif /* HAS_IN_H */ #endif /* IP_SRCROUTE && NETINET */ @@ -12,8 +12,8 @@ $NetBSD: patch-ar,v 1.2 2019/07/15 04:32:49 jnemeth Exp $ + #include <sm/fdset.h> - #define DAEMON_C 1 -@@ -754,6 +758,8 @@ getrequests(e) + #include <ratectrl.h> +@@ -774,6 +778,8 @@ getrequests(e) anynet_ntoa(&RealHostAddr)); } @@ -22,7 +22,7 @@ $NetBSD: patch-ar,v 1.2 2019/07/15 04:32:49 jnemeth Exp $ if (pipefd[0] != -1) { auto char c; -@@ -2298,16 +2304,16 @@ makeconnection(host, port, mci, e, enoug +@@ -2335,16 +2341,16 @@ makeconnection(host, port, mci, e, enoug if (hp == NULL && p[-1] == '.') { #if NAMED_BIND @@ -39,10 +39,10 @@ $NetBSD: patch-ar,v 1.2 2019/07/15 04:32:49 jnemeth Exp $ #if NAMED_BIND - _res.options = oldopts; + sm_res.options = oldopts; - #endif /* NAMED_BIND */ + #endif } *p = ']'; -@@ -2336,15 +2342,15 @@ makeconnection(host, port, mci, e, enoug +@@ -2420,15 +2426,15 @@ makeconnection(host, port, mci, e, enoug if (hp == NULL && *p == '.') { #if NAMED_BIND @@ -51,17 +51,17 @@ $NetBSD: patch-ar,v 1.2 2019/07/15 04:32:49 jnemeth Exp $ - _res.options &= ~(RES_DEFNAMES|RES_DNSRCH); + sm_res.options &= ~(RES_DEFNAMES|RES_DNSRCH); - #endif /* NAMED_BIND */ + #endif *p = '\0'; hp = sm_gethostbyname(host, family); *p = '.'; #if NAMED_BIND - _res.options = oldopts; + sm_res.options = oldopts; - #endif /* NAMED_BIND */ + #endif } } -@@ -4007,13 +4013,13 @@ host_map_lookup(map, name, av, statp) +@@ -4136,13 +4142,13 @@ host_map_lookup(map, name, av, statp) #if NAMED_BIND if (map->map_timeout > 0) { @@ -79,7 +79,7 @@ $NetBSD: patch-ar,v 1.2 2019/07/15 04:32:49 jnemeth Exp $ } #endif /* NAMED_BIND */ -@@ -4076,9 +4082,9 @@ host_map_lookup(map, name, av, statp) +@@ -4220,9 +4226,9 @@ host_map_lookup(map, name, av, statp) } #if NAMED_BIND if (map->map_timeout > 0) @@ -91,7 +91,7 @@ $NetBSD: patch-ar,v 1.2 2019/07/15 04:32:49 jnemeth Exp $ #endif /* NAMED_BIND */ s->s_namecanon.nc_flags |= NCF_VALID; /* will be soon */ -@@ -4407,11 +4413,11 @@ hostnamebyanyaddr(sap) +@@ -4551,11 +4557,11 @@ hostnamebyanyaddr(sap) # if NAMED_BIND /* shorten name server timeout to avoid higher level timeouts */ @@ -108,12 +108,12 @@ $NetBSD: patch-ar,v 1.2 2019/07/15 04:32:49 jnemeth Exp $ # endif /* NAMED_BIND */ switch (sap->sa.sa_family) -@@ -4450,7 +4456,7 @@ hostnamebyanyaddr(sap) +@@ -4594,7 +4600,7 @@ hostnamebyanyaddr(sap) } # if NAMED_BIND - _res.retry = saveretry; + sm_res.retry = saveretry; - # endif /* NAMED_BIND */ + # endif # if NETINET || NETINET6 |