svn commit: samba r4344 - in branches/SAMBA_4_0/source/rpc_server/samr: .

[vlendec at samba.org]

Author: vlendec
Date: 2004-12-23 12:02:55 +0000 (Thu, 23 Dec 2004)
New Revision: 4344

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4344

Log:
Unify memory handling in dcerpc_samr.c a bit
Modified:
   branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c


Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c	2004-12-23 09:36:49 UTC (rev 4343)
+++ branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c	2004-12-23 12:02:55 UTC (rev 4344)
@@ -510,7 +510,6 @@
 	a_state->account_sid = talloc_steal(a_state, sidstr);
 	a_state->account_name = talloc_strdup(a_state, groupname);
 	if (!a_state->account_name) {
-		talloc_free(a_state);
 		return NT_STATUS_NO_MEMORY;
 	}
 
@@ -693,14 +692,12 @@
 	a_state->account_sid = talloc_steal(a_state, sidstr);
 	a_state->account_name = talloc_strdup(a_state, account_name);
 	if (!a_state->account_name) {
-		talloc_free(a_state);
 		return NT_STATUS_NO_MEMORY;
 	}
 
 	/* create the policy handle */
 	u_handle = dcesrv_handle_new(dce_call->conn, SAMR_HANDLE_USER);
 	if (!u_handle) {
-		talloc_free(a_state);
 		return NT_STATUS_NO_MEMORY;
 	}
 
@@ -932,9 +929,7 @@
 	a_state->account_dn = talloc_steal(a_state, msg.dn);
 	a_state->account_sid = talloc_steal(a_state, sidstr);
 	a_state->account_name = talloc_strdup(a_state, aliasname);
-
-	if (a_state->account_name == NULL) {
-		talloc_free(a_state);
+	if (!a_state->account_name) {
 		return NT_STATUS_NO_MEMORY;
 	}
 
@@ -1119,9 +1114,9 @@
 	a_state->access_mask = r->in.access_mask;
 	a_state->domain_state = talloc_reference(a_state, d_state);
 	a_state->account_dn = talloc_steal(a_state, msgs[0]->dn);
-	a_state->account_sid = talloc_strdup(a_state, sidstr);
+	a_state->account_sid = talloc_steal(a_state, sidstr);
 	a_state->account_name = talloc_strdup(a_state, groupname);
-	if (!a_state->account_name || !a_state->account_sid) {
+	if (!a_state->account_name) {
 		return NT_STATUS_NO_MEMORY;
 	}
 
@@ -1486,10 +1481,10 @@
 	a_state->sam_ctx = d_state->sam_ctx;
 	a_state->access_mask = r->in.access_mask;
 	a_state->domain_state = talloc_reference(a_state, d_state);
-	a_state->account_dn = talloc_steal(d_state, msgs[0]->dn);
-	a_state->account_sid = talloc_strdup(d_state, sidstr);
-	a_state->account_name = talloc_strdup(d_state, account_name);
-	if (!a_state->account_name || !a_state->account_sid) {
+	a_state->account_dn = talloc_steal(a_state, msgs[0]->dn);
+	a_state->account_sid = talloc_steal(a_state, sidstr);
+	a_state->account_name = talloc_strdup(a_state, account_name);
+	if (!a_state->account_name) {
 		return NT_STATUS_NO_MEMORY;
 	}