[SCM] Samba Shared Repository - branch v3-6-test updated

Jeremy Allison jra at samba.org
Tue Feb 15 18:27:36 MST 2011


The branch, v3-6-test has been updated
       via  518f1a2 s3-auth Fix memory leak in security=share and force user =
       via  320e549 Merge branch 'v3-6-test' of ssh://git.samba.org/data/git/samba into v3-6-test
       via  25e21dc tdb: Fix a C++ warning
      from  ccb3d5e s3-librpc: move server_id marshalling to own helper file.

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


- Log -----------------------------------------------------------------
commit 518f1a2a35920ebf43c29b163a5091a9d92b5264
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
    (cherry picked from commit 1354d3dc747344390302e3fd2a202ff372985a9c)

commit 320e5492d037a7bbd4a42af43db70d3a14f5477d
Merge: 25e21dc92ecd29f0b4be23bd730ff7886818e0eb ccb3d5edc9bd6e6c4da7aadd166151ee44819431
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 15 17:22:32 2011 -0800

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

commit 25e21dc92ecd29f0b4be23bd730ff7886818e0eb
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Feb 12 17:30:11 2011 +0100

    tdb: Fix a C++ warning
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sat Feb 12 19:50:55 CET 2011 on sn-devel-104
    (cherry picked from commit 91cad71390bd2a0330891083c65d3f9000b74657)

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

Summary of changes:
 lib/tdb/common/summary.c |    2 +-
 source3/auth/auth_util.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/common/summary.c b/lib/tdb/common/summary.c
index 29959f9..da1ec2b 100644
--- a/lib/tdb/common/summary.c
+++ b/lib/tdb/common/summary.c
@@ -155,7 +155,7 @@ _PUBLIC_ char *tdb_summary(struct tdb_context *tdb)
 
 	/* 20 is max length of a %zu. */
 	len = strlen(SUMMARY_FORMAT) + 35*20 + 1;
-	ret = malloc(len);
+	ret = (char *)malloc(len);
 	if (!ret)
 		goto unlock;
 
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index c319edf..3cc8e11 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


More information about the samba-cvs mailing list