Changeset 228 for branches/samba-3.2.x/source/lib/util_pw.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/lib/util_pw.c (modified) (1 diff)

branches/samba-3.2.x/source/lib/util_pw.c

@@ -45 +45 @@
 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(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(NULL, temp);
-        if (cached == NULL) {
-                /*
-                 * Just don't add this into the cache, ignore the failure
-                 */
-                return temp;
+        for_cache = tcopy_passwd(NULL, pw);
+        if (for_cache == NULL) {
+                return NULL;
         }
 
         memcache_add_talloc(NULL, GETPWNAM_CACHE, data_blob_string_const(name),
-                            cached);
-        return tcopy_passwd(mem_ctx, temp);
+                            &for_cache);
+
+        return tcopy_passwd(mem_ctx, pw);
 }