[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  1354d3d s3-auth Fix memory leak in security=share and force user =
       via  dce69c2 waf Fix dependencies for .pc (pkg-config) files
      from  e34ba44 s3-librpc: move server_id marshalling to own helper file.

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


- Log -----------------------------------------------------------------
commit 1354d3dc747344390302e3fd2a202ff372985a9c
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Feb 11 11:34:56 2011 +1100

    s3-auth Fix memory leak in security=share and force user =
    
    In these cases, the server_info was not stolen onto a long term memory
    context, and so remained on the NULL context where it was created.
    
    Andrew Bartlett
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Wed Feb 16 01:08:19 CET 2011 on sn-devel-104

commit dce69c29e7a6c6e5f818bed21cb251b1a5f60556
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Feb 16 10:18:12 2011 +1100

    waf Fix dependencies for .pc (pkg-config) files
    
    We used the wrong parameter for the dependency calculation.
    
    thanks to Thomas Nagy for the fix!
    
    Andrew Bartlett

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

Summary of changes:
 buildtools/wafsamba/wafsamba.py |    2 +-
 source3/auth/auth_util.c        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 0949949..be8cad3 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -523,7 +523,7 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
         before='cc',
         ext_out='.c',
         samba_type='GENERATOR',
-        vars = [rule],
+        dep_vars = [rule] + (vars or []),
         name=name)
 
     if always:
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 7673664..1c036ff 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -819,7 +819,7 @@ NTSTATUS make_serverinfo_from_username(TALLOC_CTX *mem_ctx,
 		return status;
 	}
 
-	*presult = result;
+	*presult = talloc_steal(mem_ctx, result);
 	return NT_STATUS_OK;
 }
 


-- 
Samba Shared Repository