r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use

the new talloc() features:

 Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d
 since the methods use the object pointer as the talloc context for
 internal private data.

 There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy()
 pair of functions.  Simply TALLOC_ZERO_P() and TALLOC_FREE() the
 object.

Also had to convert the printer_info_2->NT_PRINTER_DATA field
to be talloc()'d as well.  This is just a stop on the road to
cleaning up the printer memory management.
(This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)

1 files changed, 1 insertions, 23 deletions

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 2677a4a2df..45b683e9c6 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -5356,32 +5356,10 @@ error:
 }
 
 BOOL uni_2_asc_printer_info_2(const SPOOL_PRINTER_INFO_LEVEL_2 *uni,
-                              NT_PRINTER_INFO_LEVEL_2  **asc)
+                              NT_PRINTER_INFO_LEVEL_2  *d)
 {
-	NT_PRINTER_INFO_LEVEL_2 *d;
-	time_t time_unix;
-	
 	DEBUG(7,("Converting from UNICODE to ASCII\n"));
-	time_unix=time(NULL);
 	
-	if (*asc==NULL) {
-		DEBUGADD(8,("allocating memory\n"));
-
-		*asc=SMB_MALLOC_P(NT_PRINTER_INFO_LEVEL_2);
-		if(*asc == NULL)
-			return False;
-		ZERO_STRUCTP(*asc);
-		
-		/* we allocate memory iff called from 
-		 * addprinter(ex) so we can do one time stuff here.
-		 */
-		(*asc)->setuptime=time_unix;
-
-	}	
-	DEBUGADD(8,("start converting\n"));
-
-	d=*asc;
-		
 	d->attributes=uni->attributes;
 	d->priority=uni->priority;
 	d->default_priority=uni->default_priority;