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 2c8f2d4a7d9f763d19fcd231f79ce099c6b587f4..4d4041cd5fdb6f8d85eab66de7cf8dc3552d1914 100644 (file)
--- a/source3/lib/util_pw.c
+++ b/source3/lib/util_pw.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,11 +16,11 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "memcache.h"
 
 struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, const struct passwd *from) 
 {
@@ -38,75 +38,35 @@ struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, const struct passwd *from)
        return ret;
 }
 
-#define PWNAMCACHE_SIZE 4
-static struct passwd **pwnam_cache = NULL;
-
-static void init_pwnam_cache(void)
-{
-       if (pwnam_cache != NULL)
-               return;
-
-       pwnam_cache = TALLOC_ZERO_ARRAY(NULL, struct passwd *,
-                                       PWNAMCACHE_SIZE);
-       if (pwnam_cache == NULL) {
-               smb_panic("Could not init pwnam_cache");
-       }
-
-       return;
-}
-
 void flush_pwnam_cache(void)
 {
-       TALLOC_FREE(pwnam_cache);
-       pwnam_cache = NULL;
-       init_pwnam_cache();
+       memcache_flush(NULL, GETPWNAM_CACHE);
 }
 
 struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name)
 {
-       int i;
-
-       struct passwd *temp;
+       struct passwd *pw, *for_cache;
 
-       init_pwnam_cache();
-
-       for (i=0; i<PWNAMCACHE_SIZE; i++) {
-               if ((pwnam_cache[i] != NULL) && 
-                   (strcmp(name, pwnam_cache[i]->pw_name) == 0)) {
-                       DEBUG(10, ("Got %s from pwnam_cache\n", name));
-                       return tcopy_passwd(mem_ctx, pwnam_cache[i]);
-               }
+       pw = (struct passwd *)memcache_lookup_talloc(
+               NULL, GETPWNAM_CACHE, data_blob_string_const_null(name));
+       if (pw != NULL) {
+               return tcopy_passwd(mem_ctx, pw);
        }
 
-       temp = sys_getpwnam(name);
-       
-       if (!temp) {
-#if 0
-               if (errno == ENOMEM) {
-                       /* what now? */
-               }
-#endif
+       pw = sys_getpwnam(name);
+       if (pw == NULL) {
                return NULL;
        }
 
-       for (i=0; i<PWNAMCACHE_SIZE; i++) {
-               if (pwnam_cache[i] == NULL)
-                       break;
-       }
-
-       if (i == PWNAMCACHE_SIZE)
-               i = rand() % PWNAMCACHE_SIZE;
-
-       if (pwnam_cache[i] != NULL) {
-               /* Remove this old cache entry, from the cache.  We
-                * use talloc_unlink here because we want to be very
-                * clear which referece we are removing */
-               talloc_unlink(pwnam_cache, pwnam_cache[i]);
+       for_cache = tcopy_passwd(talloc_autofree_context(), pw);
+       if (for_cache == NULL) {
+               return NULL;
        }
 
-       pwnam_cache[i] = tcopy_passwd(pwnam_cache, temp);
+       memcache_add_talloc(NULL, GETPWNAM_CACHE,
+                           data_blob_string_const_null(name), &for_cache);
 
-       return tcopy_passwd(mem_ctx, temp);
+       return tcopy_passwd(mem_ctx, pw);
 }
 
 struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid)