[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-456-g74c405d

[Jeremy Allison]

The branch, master has been updated
       via  74c405db406d0971ba4fe2abae4ebd950d27ab1c (commit)
      from  4a754d029b0eb229b23980aa4a80dae2b485a302 (commit)

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


- Log -----------------------------------------------------------------
commit 74c405db406d0971ba4fe2abae4ebd950d27ab1c
Author: Jeremy Allison <j...@samba.org>
Date:   Thu Jul 16 09:54:14 2009 -0700

    Tidyup prompted by #6554 - Wrong deallocation in sam_account_ok.
    Jeremy.

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

Summary of changes:
 source3/auth/auth_sam.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index a2634fe..26b45e4 100644
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.c
@@ -226,10 +226,10 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
 
        if (*workstation_list) {
                bool invalid_ws = True;
-               char *tok;
+               char *tok = NULL;
                const char *s = workstation_list;
+               char *machine_name = talloc_asprintf(mem_ctx, "%s$", 
user_info->wksta_name);
 
-               const char *machine_name = talloc_asprintf(mem_ctx, "%s$", 
user_info->wksta_name);
                if (machine_name == NULL)
                        return NT_STATUS_NO_MEMORY;
 
@@ -251,6 +251,7 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
                        TALLOC_FREE(tok);
                }
                TALLOC_FREE(tok);
+               TALLOC_FREE(machine_name);
 
                if (invalid_ws)
                        return NT_STATUS_INVALID_WORKSTATION;


-- 
Samba Shared Repository