[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2712-gb753087

[Günther Deschner]

The branch, v3-2-test has been updated
       via  b753087ff79c1d35a409eddc1f61e115e887c1e1 (commit)
       via  d7ce643285276790a65faff76666498595a508d7 (commit)
       via  8cd07c1fa8f435f7ff3dc79c195da9324fb2452f (commit)
      from  0d73bde6de4391e7aec862424762473441fa0905 (commit)

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


- Log -----------------------------------------------------------------
commit b753087ff79c1d35a409eddc1f61e115e887c1e1
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 4 11:07:13 2008 +0100

    Use TALLOC_FREE in libnetjoin debugging dump code.
    
    Guenther

commit d7ce643285276790a65faff76666498595a508d7
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 4 11:06:02 2008 +0100

    Zero more structs initially in LSA rpc server.
    
    Guenther

commit 8cd07c1fa8f435f7ff3dc79c195da9324fb2452f
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 4 11:04:36 2008 +0100

    Move talloc_init to the right place in "net ads join".
    
    Guenther

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

Summary of changes:
 source/libnet/libnet_join.c    |    4 ++--
 source/rpc_server/srv_lsa_nt.c |    4 ++++
 source/utils/net_ads.c         |   12 ++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index 866d1c0..4f9e4c1 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -29,7 +29,7 @@
 		char *str = NULL; \
 		str = NDR_PRINT_FUNCTION_STRING(ctx, libnet_JoinCtx, f, r); \
 		DEBUG(1,("libnet_Join:\n%s", str)); \
-		talloc_free(str); \
+		TALLOC_FREE(str); \
 	} while (0)
 
 #define LIBNET_JOIN_IN_DUMP_CTX(ctx, r) \
@@ -42,7 +42,7 @@
 		char *str = NULL; \
 		str = NDR_PRINT_FUNCTION_STRING(ctx, libnet_UnjoinCtx, f, r); \
 		DEBUG(1,("libnet_Unjoin:\n%s", str)); \
-		talloc_free(str); \
+		TALLOC_FREE(str); \
 	} while (0)
 
 #define LIBNET_UNJOIN_IN_DUMP_CTX(ctx, r) \
diff --git a/source/rpc_server/srv_lsa_nt.c b/source/rpc_server/srv_lsa_nt.c
index ce3fd1a..c250214 100644
--- a/source/rpc_server/srv_lsa_nt.c
+++ b/source/rpc_server/srv_lsa_nt.c
@@ -82,6 +82,8 @@ static int init_lsa_ref_domain_list(TALLOC_CTX *mem_ctx,
 		return -1;
 	}
 
+	ZERO_STRUCT(ref->domains[num]);
+
 	init_lsa_StringLarge(&ref->domains[num].name, dom_name);
 	ref->domains[num].sid = sid_dup_talloc(mem_ctx, dom_sid);
 	if (!ref->domains[num].sid) {
@@ -228,6 +230,8 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx,
 		const char *domain;
 		enum lsa_SidType type = SID_NAME_UNKNOWN;
 
+		ZERO_STRUCT(sid);
+
 		/* Split name into domain and user component */
 
 		full_name = name[i].string;
diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index 9358a4f..46e0a25 100644
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -1121,6 +1121,12 @@ int net_ads_join(int argc, const char **argv)
 		goto fail;
 	}
 
+	if (!(ctx = talloc_init("net_ads_join"))) {
+		d_fprintf(stderr, "Could not initialise talloc context.\n");
+		werr = WERR_NOMEM;
+		goto fail;
+	}
+
 	use_in_memory_ccache();
 
 	werr = libnet_init_JoinCtx(ctx, &r);
@@ -1128,12 +1134,6 @@ int net_ads_join(int argc, const char **argv)
 		goto fail;
 	}
 
-	if (!(ctx = talloc_init("net_ads_join"))) {
-		d_fprintf(stderr, "Could not initialise talloc context.\n");
-		werr = WERR_NOMEM;
-		goto fail;
-	}
-
 	/* process additional command line args */
 
 	for ( i=0; i<argc; i++ ) {


-- 
Samba Shared Repository