svn commit: samba r23461 - in branches/SAMBA_3_0_26/source/registry: .

[obnox at samba.org]

Author: obnox
Date: 2007-06-13 10:15:48 +0000 (Wed, 13 Jun 2007)
New Revision: 23461

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

Log:
More or less merge r21977 from 3_0:

little cosmetic change to remove a local var that's not really needed

Michael


Modified:
   branches/SAMBA_3_0_26/source/registry/reg_db.c


Changeset:
Modified: branches/SAMBA_3_0_26/source/registry/reg_db.c
===================================================================
--- branches/SAMBA_3_0_26/source/registry/reg_db.c	2007-06-13 10:12:33 UTC (rev 23460)
+++ branches/SAMBA_3_0_26/source/registry/reg_db.c	2007-06-13 10:15:48 UTC (rev 23461)
@@ -741,7 +741,6 @@
 	TALLOC_CTX *mem_ctx;
 	char *tdbkey;
 	WERROR err = WERR_NOMEM;
-	uint8 *data;
 	TDB_DATA tdbdata;
 
 	if (!(mem_ctx = talloc_init("regdb_set_secdesc"))) {
@@ -756,14 +755,13 @@
 	}
 	normalize_dbkey(tdbkey);
 
-	err = ntstatus_to_werror(marshall_sec_desc(mem_ctx, secdesc, &data,
+	err = ntstatus_to_werror(marshall_sec_desc(mem_ctx, secdesc,
+						   &tdbdata.dptr,
 						   &tdbdata.dsize));
 	if (!W_ERROR_IS_OK(err)) {
 		goto done;
 	}
 
-	tdbdata.dptr = data;
-
 	if (tdb_trans_store_bystring(tdb_reg, tdbkey, tdbdata, 0) == -1) {
 		err = ntstatus_to_werror(map_nt_error_from_unix(errno));
 		goto done;