04f01c205f
pkgsrc changes:
- consolidate several patches into site.config.m4
- pkgsrc LDFLAGS should always be used
- don't bother specifying file owner/group anywhere except in Makefile
- create include/sm/os/sm_os_netbsd.h to fix warnings and OS specific stuff
- install mail.local and rmail
- convert to use res_n* functions
- allows for linking against threaded libraries
- add a TODO file
- PR/35249 - Loren M. Lang
- can't find libraries on Linux, this should be fixed by using pkgsrc LDFLAGS
- PR/46694 - Makoto Fujiwara
- bring back netbsd-proto.mc from when sendmail was part of the base system
- PR/47207 - Richard Palo
- let pkgsrc infrastructure handle file ownership and group
- PR/48566 - Emmanuel Dreyfus
- always set _FFR_USE_GETPWNAM_ERRNO on NetBSD
- roll ffr_tls_1 and the suggested ffr_tls_ec into one new ffr_tls option
- not enabled by default because it changes behaviour
8.14.9/8.14.9 2014/05/21
SECURITY: Properly set the close-on-exec flag for file descriptors
(except stdin, stdout, and stderr) before executing mailers.
Fix a misformed comment in conf.c: "/*" within comment
which may cause a compilation error on some systems.
Problem reported by John Beck of Oracle.
DEVTOOLS: Fix regression in auto-detection of libraries when only
shared libraries are available. Problem reported by
Bryan Costales.
53 lines
1.6 KiB
Text
53 lines
1.6 KiB
Text
$NetBSD: patch-ay,v 1.1 2014/06/15 20:48:50 jnemeth Exp $
|
|
|
|
--- sendmail/sm_resolve.c.orig 2014-05-16 20:40:15.000000000 +0000
|
|
+++ sendmail/sm_resolve.c
|
|
@@ -54,2 +54,6 @@ SM_RCSID("$Id: sm_resolve.c,v 8.40 2013-
|
|
|
|
+#if NAMED_BIND
|
|
+extern struct __res_state sm_res;
|
|
+#endif
|
|
+
|
|
static struct stot
|
|
@@ -410,4 +414,4 @@ dns_lookup_int(domain, rr_class, rr_type
|
|
{
|
|
- old_options = _res.options;
|
|
- _res.options |= RES_DEBUG;
|
|
+ old_options = sm_res.options;
|
|
+ sm_res.options |= RES_DEBUG;
|
|
sm_dprintf("dns_lookup(%s, %d, %s)\n", domain,
|
|
@@ -417,4 +421,4 @@ dns_lookup_int(domain, rr_class, rr_type
|
|
{
|
|
- save_retrans = _res.retrans;
|
|
- _res.retrans = retrans;
|
|
+ save_retrans = sm_res.retrans;
|
|
+ sm_res.retrans = retrans;
|
|
}
|
|
@@ -422,4 +426,4 @@ dns_lookup_int(domain, rr_class, rr_type
|
|
{
|
|
- save_retry = _res.retry;
|
|
- _res.retry = retry;
|
|
+ save_retry = sm_res.retry;
|
|
+ sm_res.retry = retry;
|
|
}
|
|
@@ -428,3 +432,7 @@ dns_lookup_int(domain, rr_class, rr_type
|
|
reply = (unsigned char *)&reply_buf;
|
|
+#if NAMED_RESN
|
|
+ len = res_nsearch(&sm_res, domain, rr_class, rr_type, reply, SMRBSIZE);
|
|
+#else
|
|
len = res_search(domain, rr_class, rr_type, reply, SMRBSIZE);
|
|
+#endif
|
|
if (len >= SMRBSIZE)
|
|
@@ -454,3 +462,3 @@ dns_lookup_int(domain, rr_class, rr_type
|
|
{
|
|
- _res.options = old_options;
|
|
+ sm_res.options = old_options;
|
|
sm_dprintf("dns_lookup(%s, %d, %s) --> %d\n",
|
|
@@ -466,5 +474,5 @@ dns_lookup_int(domain, rr_class, rr_type
|
|
if (retrans > 0)
|
|
- _res.retrans = save_retrans;
|
|
+ sm_res.retrans = save_retrans;
|
|
if (retry > 0)
|
|
- _res.retry = save_retry;
|
|
+ sm_res.retry = save_retry;
|
|
return r;
|