s3-build: only include memcache.h where needed.

[nivanova/samba-autobuild/.git] / source3 / lib / util_pw.c

diff --git a/source3/lib/util_pw.c b/source3/lib/util_pw.c
index e138273e8b15884ade8701098c1a4f2814ae7528..4d4041cd5fdb6f8d85eab66de7cf8dc3552d1914 100644 (file)
--- a/source3/lib/util_pw.c
+++ b/source3/lib/util_pw.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "memcache.h"
 
 struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, const struct passwd *from) 
 {
@@ -44,27 +45,28 @@ void flush_pwnam_cache(void)
 
 struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name)
 {
-       struct passwd *temp, *cached;
+       struct passwd *pw, *for_cache;
 
-       temp = (struct passwd *)memcache_lookup_talloc(
+       pw = (struct passwd *)memcache_lookup_talloc(
                NULL, GETPWNAM_CACHE, data_blob_string_const_null(name));
-       if (temp != NULL) {
-               return tcopy_passwd(mem_ctx, temp);
+       if (pw != NULL) {
+               return tcopy_passwd(mem_ctx, pw);
        }
 
-       temp = sys_getpwnam(name);
-       if (temp == NULL) {
+       pw = sys_getpwnam(name);
+       if (pw == NULL) {
                return NULL;
        }
 
-       cached = tcopy_passwd(talloc_autofree_context(), temp);
-       if (cached == NULL) {
+       for_cache = tcopy_passwd(talloc_autofree_context(), pw);
+       if (for_cache == NULL) {
                return NULL;
        }
 
-       memcache_add_talloc(NULL, GETPWNAM_CACHE, data_blob_string_const_null(name),
-                           cached);
-       return tcopy_passwd(mem_ctx, temp);
+       memcache_add_talloc(NULL, GETPWNAM_CACHE,
+                           data_blob_string_const_null(name), &for_cache);
+
+       return tcopy_passwd(mem_ctx, pw);
 }
 
 struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid)