Changeset 740 for vendor/current/source3/lib/username.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/lib/username.c (modified) (10 diffs)

vendor/current/source3/lib/username.c

@@ -4 +4 @@
    Copyright (C) Andrew Tridgell 1992-1998
    Copyright (C) Jeremy Allison 1997-2001.
-   
+   Copyright (C) Andrew Bartlett 2002
+
    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 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, see <http://www.gnu.org/licenses/>.
@@ -20 +21 @@
 
 #include "includes.h"
+#include "system/passwd.h"
+#include "memcache.h"
+#include "../lib/util/util_pw.h"
 
 /* internal functions */
@@ -29 +33 @@
                                                  int N);
 
+static struct passwd *getpwnam_alloc_cached(TALLOC_CTX *mem_ctx, const char *name)
+{
+        struct passwd *pw, *for_cache;
+
+        pw = (struct passwd *)memcache_lookup_talloc(
+                NULL, GETPWNAM_CACHE, data_blob_string_const_null(name));
+        if (pw != NULL) {
+                return tcopy_passwd(mem_ctx, pw);
+        }
+
+        pw = sys_getpwnam(name);
+        if (pw == NULL) {
+                return NULL;
+        }
+
+        for_cache = tcopy_passwd(talloc_tos(), pw);
+        if (for_cache == NULL) {
+                return NULL;
+        }
+
+        memcache_add_talloc(NULL, GETPWNAM_CACHE,
+                        data_blob_string_const_null(name), &for_cache);
+
+        return tcopy_passwd(mem_ctx, pw);
+}
+
+/****************************************************************************
+ Flush all cached passwd structs.
+****************************************************************************/
+
+void flush_pwnam_cache(void)
+{
+        memcache_flush(NULL, GETPWNAM_CACHE);
+}
+
 /****************************************************************************
  Get a users home directory.
@@ -76 +115 @@
         strlower_m(user2);
         DEBUG(5,("Trying _Get_Pwnam(), username as lowercase is %s\n",user2));
-        ret = getpwnam_alloc(mem_ctx, user2);
+        ret = getpwnam_alloc_cached(mem_ctx, user2);
         if(ret)
                 goto done;
@@ -84 +123 @@
                 DEBUG(5,("Trying _Get_Pwnam(), username as given is %s\n",
                          user));
-                ret = getpwnam_alloc(mem_ctx, user);
+                ret = getpwnam_alloc_cached(mem_ctx, user);
                 if(ret)
                         goto done;
@@ -94 +133 @@
                 DEBUG(5,("Trying _Get_Pwnam(), username as uppercase is %s\n",
                          user2));
-                ret = getpwnam_alloc(mem_ctx, user2);
+                ret = getpwnam_alloc_cached(mem_ctx, user2);
                 if(ret)
                         goto done;
@@ -103 +142 @@
         DEBUG(5,("Checking combinations of %d uppercase letters in %s\n",
                  lp_usernamelevel(), user2));
-        ret = uname_string_combinations(user2, mem_ctx, getpwnam_alloc,
+        ret = uname_string_combinations(user2, mem_ctx, getpwnam_alloc_cached,
                                         lp_usernamelevel());
 
@@ -122 +161 @@
 {
         fstring user2;
-        struct passwd *ret;
 
         if ( *user == '\0' ) {
@@ -133 +171 @@
         DEBUG(5,("Finding user %s\n", user));
 
-        ret = Get_Pwnam_internals(mem_ctx, user, user2);
-        
-        return ret;  
+        return Get_Pwnam_internals(mem_ctx, user, user2);
 }
 
@@ -161 +197 @@
         for (i=offset;i<(len-(N-1));i++) {
                 char c = s[i];
-                if (!islower_ascii((int)c))
+                if (!islower_m((int)c))
                         continue;
-                s[i] = toupper_ascii(c);
+                s[i] = toupper_m(c);
                 ret = uname_string_combinations2(s, mem_ctx, i+1, fn, N-1);
                 if(ret)