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

2008-08-14 Thread Herb Lewis
The branch, v3-2-test has been updated
   via  4d83924470b267f2267abd62a3be2ac3ae373d7b (commit)
   via  b022e8c249c5f77ea5716613e97158669429c447 (commit)
  from  12b4ed7c3c10a6a29d108f6a83d961bf19751ca7 (commit)

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


- Log -
commit 4d83924470b267f2267abd62a3be2ac3ae373d7b
Merge: b022e8c249c5f77ea5716613e97158669429c447 
12b4ed7c3c10a6a29d108f6a83d961bf19751ca7
Author: Herb Lewis [EMAIL PROTECTED]
Date:   Thu Aug 14 12:20:22 2008 -0700

Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into 
my32-test

commit b022e8c249c5f77ea5716613e97158669429c447
Author: Herb Lewis [EMAIL PROTECTED]
Date:   Thu Aug 14 12:19:36 2008 -0700

use correct argument

---

Summary of changes:
 source/auth/auth_util.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 2024526..23e3fc0 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -698,7 +698,7 @@ NTSTATUS create_local_token(auth_serversupplied_info 
*server_info)

} else {
server_info-ptok = create_local_nt_token(
-   server_info,
+   mem_ctx,
pdb_get_user_sid(server_info-sam_account),
server_info-guest,
server_info-num_sids, server_info-sids);


-- 
Samba Shared Repository


Re: [SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2910-g4d83924

2008-08-14 Thread Jeremy Allison
On Thu, Aug 14, 2008 at 02:20:56PM -0500, Herb Lewis wrote:
 The branch, v3-2-test has been updated
via  4d83924470b267f2267abd62a3be2ac3ae373d7b (commit)
via  b022e8c249c5f77ea5716613e97158669429c447 (commit)
   from  12b4ed7c3c10a6a29d108f6a83d961bf19751ca7 (commit)
 
 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
 
 
 - Log -
 commit 4d83924470b267f2267abd62a3be2ac3ae373d7b
 Merge: b022e8c249c5f77ea5716613e97158669429c447 
 12b4ed7c3c10a6a29d108f6a83d961bf19751ca7
 Author: Herb Lewis [EMAIL PROTECTED]
 Date:   Thu Aug 14 12:20:22 2008 -0700
 
 Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into 
 my32-test
 
 commit b022e8c249c5f77ea5716613e97158669429c447
 Author: Herb Lewis [EMAIL PROTECTED]
 Date:   Thu Aug 14 12:19:36 2008 -0700
 
 use correct argument
 
 ---
 
 Summary of changes:
  source/auth/auth_util.c |2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 
 Changeset truncated at 500 lines:
 
 diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
 index 2024526..23e3fc0 100644
 --- a/source/auth/auth_util.c
 +++ b/source/auth/auth_util.c
 @@ -698,7 +698,7 @@ NTSTATUS create_local_token(auth_serversupplied_info 
 *server_info)
   
   } else {
   server_info-ptok = create_local_nt_token(
 - server_info,
 + mem_ctx,
   pdb_get_user_sid(server_info-sam_account),
   server_info-guest,
   server_info-num_sids, server_info-sids);

This looks wrong to me. The ptok should be talloc'ed hanging
off the server_info struct - it's meant to stay around and be
deallocated when server_info goes away.

Jeremy.