[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4370-gfe4e662

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  fe4e662a2b0df2d3cd4cc9ca8611dd062e1b52b6 (commit)
      from  a1c1c381ab2bb3a142d277971a89cfd8833b3e80 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit fe4e662a2b0df2d3cd4cc9ca8611dd062e1b52b6
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Fri Nov 14 13:13:40 2008 +0100

    Rename some variables in getpwnam_alloc() for clarity

-----------------------------------------------------------------------

Summary of changes:
 source/lib/util_pw.c |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/util_pw.c b/source/lib/util_pw.c
index e6abd05..f0f3f00 100644
--- a/source/lib/util_pw.c
+++ b/source/lib/util_pw.c
@@ -44,27 +44,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(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(name),
-                           cached);
-       return tcopy_passwd(mem_ctx, temp);
+                           for_cache);
+
+       return tcopy_passwd(mem_ctx, pw);
 }
 
 struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid) 


-- 
Samba Shared Repository