summaryrefslogtreecommitdiffstats
path: root/libc/unistd
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2010-03-08 15:13:04 -0800
committerDavid 'Digit' Turner <digit@google.com>2010-03-08 15:22:13 -0800
commitd378c68d74cb4fdac450650fe816c9d649c8edaf (patch)
tree0d5c15b4606982f26009bdc5c572415ac9dd18d3 /libc/unistd
parentd7ed1ae98249af8a58ce97784a29f048d77789a9 (diff)
downloadbionic-d378c68d74cb4fdac450650fe816c9d649c8edaf.zip
bionic-d378c68d74cb4fdac450650fe816c9d649c8edaf.tar.gz
bionic-d378c68d74cb4fdac450650fe816c9d649c8edaf.tar.bz2
Fix spurious DNS lookups in the C library.
The problem was that the 'defdname' field of res_state structure was not properly initialized in __res_vinit(). This field is used to store the default domain name, which is normally build from calling gethostname() (see line 549 of res_init.c). Unfortunately, in the typical Android case, gethostname() returns an error (the hostname is configured) and a random stack string is used later to build the DNS search list (see lines 556+ in res_init.c) For the sake of illustration, let's say the search list is set to a random value like 'xWLK'. The end result is that when trying to result an unknown domain name (e.g. 'www.ptn'), the query fails then the resolver tries to make a new query with the DNS search list path(s) appended (e.g. 'www.ptn.xWLK'). The patch simply initializes 'defdname' to an empty string to avoid this when the net.dns.search system property is not set. Also contains whitespace/formatting fixes
Diffstat (limited to 'libc/unistd')
-rw-r--r--libc/unistd/gethostname.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/unistd/gethostname.c b/libc/unistd/gethostname.c
index 369d21e..5d3d7d9 100644
--- a/libc/unistd/gethostname.c
+++ b/libc/unistd/gethostname.c
@@ -41,11 +41,11 @@ int gethostname(char* buff, size_t buflen)
int namelen = strlen(name.nodename);
if ((int)buflen < namelen+1) {
- errno = EINVAL;
+ errno = EINVAL;
result = -1;
} else {
memcpy( buff, name.nodename, namelen+1 );
- }
+ }
}
return result;
}