summaryrefslogtreecommitdiff
path: root/source3/lib/util_sock.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-01-23 13:08:14 +1100
committerAndrew Tridgell <tridge@samba.org>2008-01-23 13:08:14 +1100
commit39d172bf34d0cbb3bf3e3a04d534876097cdccb5 (patch)
tree3a32fd867e34c9a86c3a2f01308445b76bf2d50c /source3/lib/util_sock.c
parent2caa0e82f5ff2f45a5c912c624e54c4a43f0c3cc (diff)
parent9051199e40dec27d3532fbec7f5744033def1874 (diff)
downloadsamba-39d172bf34d0cbb3bf3e3a04d534876097cdccb5.tar.gz
samba-39d172bf34d0cbb3bf3e3a04d534876097cdccb5.tar.bz2
samba-39d172bf34d0cbb3bf3e3a04d534876097cdccb5.zip
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit bc2973df8504850a40cb0a1172689dc0bdafa323)
Diffstat (limited to 'source3/lib/util_sock.c')
-rw-r--r--source3/lib/util_sock.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 10428113ae..a3975f6c1f 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -2080,14 +2080,15 @@ const char *get_mydnsfullname(void)
data_blob_string_const("get_mydnsfullname"),
data_blob_string_const(res->ai_canonname));
- freeaddrinfo(res);
-
if (!memcache_lookup(NULL, SINGLETON_CACHE,
data_blob_string_const("get_mydnsfullname"),
&tmp)) {
- return NULL;
+ tmp = data_blob_talloc(talloc_tos(), res->ai_canonname,
+ strlen(res->ai_canonname) + 1);
}
+ freeaddrinfo(res);
+
return (const char *)tmp.data;
}