aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Wu <rob@robwu.nl>2015-12-16 12:53:27 +0100
committerMike Frysinger <vapier@gentoo.org>2015-12-29 13:28:04 -0500
commitb674b821091141c5eed7d423612d3b10703e9c62 (patch)
tree7da637b96788280ce05389ce4529399d0da02249
parentd51442aacdbdb63e2f10815d843b551a9291d7a5 (diff)
downloadtermbaud-b674b821091141c5eed7d423612d3b10703e9c62.tar.gz
termbaud-b674b821091141c5eed7d423612d3b10703e9c62.tar.xz
termbaud-b674b821091141c5eed7d423612d3b10703e9c62.zip
resolv: Reset defdname before use in __res_vinit [BZ #19369]
Resetting defdname (default domain name) before use in __res_vinit ensures that the default domain name is correctly set to a default value when it is not set by the LOCALDOMAIN environment variable or the "domain" or "search" parameters in resolv.conf Tested using the steps from: https://sourceware.org/bugzilla/show_bug.cgi?id=19369
-rw-r--r--ChangeLog5
-rw-r--r--resolv/res_init.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c2c5af6e662..5135c017857 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-29 Rob Wu <rob@robwu.nl>
+
+ [BZ #19369]
+ * resolv/res_init.c (__res_vinit): Reset defdname before use.
+
2015-12-29 John David Anglin <danglin@gcc.gnu.org>
[BZ #19270]
diff --git a/resolv/res_init.c b/resolv/res_init.c
index c5dc8019379..e0b6a80dc76 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -176,6 +176,7 @@ __res_vinit(res_state statp, int preinit) {
}
statp->nscount = 0;
+ statp->defdname[0] = '\0';
statp->ndots = 1;
statp->pfcode = 0;
statp->_vcsock = -1;