diff options
| author | Kai Blin <kai@samba.org> | 2008-01-21 13:18:38 +0100 |
|---|---|---|
| committer | Kai Blin <kai@samba.org> | 2008-01-21 13:28:06 +0100 |
| commit | 7b6a439efe8a077bf333a9badde021eb9a54b227 (patch) | |
| tree | a89c369fd1b85dfa05fabed0db5909f59c650cd7 | |
| parent | fa32063d074cfd8906b76c13a72fee1bc2bd899d (diff) | |
| download | samba-7b6a439efe8a077bf333a9badde021eb9a54b227.tar.gz samba-7b6a439efe8a077bf333a9badde021eb9a54b227.tar.bz2 samba-7b6a439efe8a077bf333a9badde021eb9a54b227.zip | |
util_sock: Fix memcache bug in get_mydnsfullname.
get_mydnsfullname relied on memcache_add(); memcache_lookup() working.
When run from ntlm_auth, the global_cache variable in memcache is NULL, so
the add and lookup both fail. In that case, just return the result of the
getaddrinfo call.
Jeremy, please check.
(This used to be commit 1db41ff52565e9f336a22fb9ffd80d51677e023b)
| -rw-r--r-- | source3/lib/util_sock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index 10428113ae..f524d0d826 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -2080,14 +2080,14 @@ 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_string_const(res->ai_canonname); } + freeaddrinfo(res); + return (const char *)tmp.data; } |