aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacques Vidrine <nectar@FreeBSD.org>2003-08-25 22:38:53 +0000
committerJacques Vidrine <nectar@FreeBSD.org>2003-08-25 22:38:53 +0000
commitfba38ede4ffeb129bb7ec1b3ea41d77f91e0c296 (patch)
tree3d2b6d89e0cd7f140c174d7a215263cfe13130a2
parent348d8c7ec59f644d8c16a88a3c0374062d1d06e5 (diff)
downloadsrc-fba38ede4ffeb129bb7ec1b3ea41d77f91e0c296.tar.gz
src-fba38ede4ffeb129bb7ec1b3ea41d77f91e0c296.zip
Merge sm_resolve.c 1.229.2.17: Fix for DNS map processing error.
Notes
Notes: svn path=/releng/4.6/; revision=119481
-rw-r--r--UPDATING3
-rw-r--r--contrib/sendmail/src/sm_resolve.c1
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 5 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index 8c53421719cd..88c9a29cdc3b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,6 +17,9 @@ minimal number of processes, if possible, for that patch. For those
updates that don't have an advisory, or to be safe, you can do a full
build and install as described in the COMMON ITEMS section.
+20030825: p17 FreeBSD-SA-03:11.sendmail
+ Sendmail DNS map problem corrected.
+
20030810: p16 FreeBSD-SA-03:10.iBCS2
iBCS2 system call translator for statfs leaked information.
diff --git a/contrib/sendmail/src/sm_resolve.c b/contrib/sendmail/src/sm_resolve.c
index 3ab760a1bc56..6448e31b1b3e 100644
--- a/contrib/sendmail/src/sm_resolve.c
+++ b/contrib/sendmail/src/sm_resolve.c
@@ -233,6 +233,7 @@ parse_dns_reply(data, len)
dns_free_data(r);
return NULL;
}
+ memset(*rr, 0, sizeof(**rr));
(*rr)->rr_domain = sm_strdup(host);
if ((*rr)->rr_domain == NULL)
{
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index efca2100adab..a201a5da626e 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="4.6.2"
-BRANCH="RELEASE-p16"
+BRANCH="RELEASE-p17"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"