[SCM] Samba Shared Repository - branch master updated - 5a210cc552f92459dc05c44a435acbcbbe6db9e7

[Volker Lendecke]

The branch, master has been updated
       via  5a210cc552f92459dc05c44a435acbcbbe6db9e7 (commit)
      from  1b41f670fc40ac583f546440c2a683e94eb05caf (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5a210cc552f92459dc05c44a435acbcbbe6db9e7
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:
 source3/lib/util_pw.c |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/util_pw.c b/source3/lib/util_pw.c
index e138273..c9b26f0 100644
--- a/source3/lib/util_pw.c
+++ b/source3/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_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) 


-- 
Samba Shared Repository