summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/include/memcache.h3
-rw-r--r--source3/lib/access.c20
2 files changed, 20 insertions, 3 deletions
diff --git a/source3/include/memcache.h b/source3/include/memcache.h
index 36cde98bd3..c4a2974b62 100644
--- a/source3/include/memcache.h
+++ b/source3/include/memcache.h
@@ -32,7 +32,8 @@ enum memcache_number {
SID_GID_CACHE,
GETWD_CACHE,
GETPWNAM_CACHE, /* talloc */
- MANGLE_HASH2_CACHE
+ MANGLE_HASH2_CACHE,
+ SINGLETON_CACHE
};
struct memcache *memcache_init(TALLOC_CTX *mem_ctx, size_t max_size);
diff --git a/source3/lib/access.c b/source3/lib/access.c
index 1e4df83607..6a463446d1 100644
--- a/source3/lib/access.c
+++ b/source3/lib/access.c
@@ -97,13 +97,29 @@ static bool string_match(const char *tok,const char *s)
}
} else if (tok[0] == '@') { /* netgroup: look it up */
#ifdef HAVE_NETGROUP
- static char *mydomain = NULL;
+ DATA_BLOB tmp;
+ char *mydomain = NULL;
char *hostname = NULL;
bool netgroup_ok = false;
- if (!mydomain)
+ if (memcache_lookup(
+ NULL, SINGLETON_CACHE,
+ data_blob_string_const("yp_default_domain"),
+ &tmp)) {
+
+ SMB_ASSERT(tmp.length > 0);
+ mydomain = (tmp.data[0] == '\0')
+ ? NULL : (char *)tmp.data;
+ }
+ else {
yp_get_default_domain(&mydomain);
+ memcache_add(
+ NULL, SINGLETON_CACHE,
+ data_blob_string_const("yp_default_domain"),
+ data_blob_string_const(mydomain?mydomain:""));
+ }
+
if (!mydomain) {
DEBUG(0,("Unable to get default yp domain. "
"Try without it.\n"));