Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec

1 files changed, 18 insertions, 45 deletions

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index d8658e9280..8e6fe1f364 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -343,7 +343,7 @@ static bool upgrade_to_version_3(void)
 static int sec_desc_upg_fn( TDB_CONTEXT *the_tdb, TDB_DATA key,
                             TDB_DATA data, void *state )
 {
-	prs_struct ps;
+	NTSTATUS status;
 	SEC_DESC_BUF *sd_orig = NULL;
 	SEC_DESC_BUF *sd_new, *sd_store;
 	SEC_DESC *sec, *new_sec;
@@ -362,22 +362,16 @@ static int sec_desc_upg_fn( TDB_CONTEXT *the_tdb, TDB_DATA key,
 
 	/* upgrade the security descriptor */
 
-	ZERO_STRUCT( ps );
-
-	prs_init_empty( &ps, ctx, UNMARSHALL );
-	prs_give_memory( &ps, (char *)data.dptr, data.dsize, False );
-
-	if ( !sec_io_desc_buf( "sec_desc_upg_fn", &sd_orig, &ps, 1 ) ) {
+	status = unmarshall_sec_desc_buf(ctx, data.dptr, data.dsize, &sd_orig);
+	if (!NT_STATUS_IS_OK(status)) {
 		/* delete bad entries */
 		DEBUG(0,("sec_desc_upg_fn: Failed to parse original sec_desc for %si.  Deleting....\n",
 			(const char *)key.dptr ));
 		tdb_delete( tdb_printers, key );
-		prs_mem_free( &ps );
 		return 0;
 	}
 
 	if (!sd_orig) {
-		prs_mem_free( &ps );
 		return 0;
 	}
 	sec = sd_orig->sd;
@@ -385,7 +379,6 @@ static int sec_desc_upg_fn( TDB_CONTEXT *the_tdb, TDB_DATA key,
 	/* is this even valid? */
 
 	if ( !sec->dacl ) {
-		prs_mem_free( &ps );
 		return 0;
 	}
 
@@ -416,45 +409,31 @@ static int sec_desc_upg_fn( TDB_CONTEXT *the_tdb, TDB_DATA key,
 				 &global_sid_Builtin_Administrators,
 				 NULL, NULL, &size_new_sec );
 	if (!new_sec) {
-		prs_mem_free( &ps );
 		return 0;
 	}
 	sd_new = make_sec_desc_buf( ctx, size_new_sec, new_sec );
 	if (!sd_new) {
-		prs_mem_free( &ps );
 		return 0;
 	}
 
 	if ( !(sd_store = sec_desc_merge( ctx, sd_new, sd_orig )) ) {
 		DEBUG(0,("sec_desc_upg_fn: Failed to update sec_desc for %s\n", key.dptr ));
-		prs_mem_free( &ps );
 		return 0;
 	}
 
-	prs_mem_free( &ps );
-
 	/* store it back */
 
 	sd_size = ndr_size_security_descriptor(sd_store->sd, NULL, 0)
 		+ sizeof(SEC_DESC_BUF);
-	if ( !prs_init(&ps, sd_size, ctx, MARSHALL) ) {
-		DEBUG(0,("sec_desc_upg_fn: Failed to allocate prs memory for %s\n", key.dptr ));
-		return 0;
-	}
 
-	if ( !sec_io_desc_buf( "sec_desc_upg_fn", &sd_store, &ps, 1 ) ) {
+	status = marshall_sec_desc_buf(ctx, sd_store, &data.dptr, &data.dsize);
+	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("sec_desc_upg_fn: Failed to parse new sec_desc for %s\n", key.dptr ));
-		prs_mem_free( &ps );
 		return 0;
 	}
 
-	data.dptr = (uint8 *)prs_data_p( &ps );
-	data.dsize = sd_size;
-
 	result = tdb_store( tdb_printers, key, data, TDB_REPLACE );
 
-	prs_mem_free( &ps );
-
 	/* 0 to continue and non-zero to stop traversal */
 
 	return (result == -1);
@@ -789,13 +768,6 @@ bool get_a_builtin_ntform_by_string(const char *form_name, nt_forms_struct *form
 	return (i !=count);
 }
 
-bool get_a_builtin_ntform(UNISTR2 *uni_formname,nt_forms_struct *form)
-{
-	fstring form_name;
-	unistr2_to_ascii(form_name, uni_formname, sizeof(form_name));
-	return get_a_builtin_ntform_by_string(form_name, form);
-}
-
 /****************************************************************************
  get a form struct list.
 ****************************************************************************/
@@ -4590,24 +4562,25 @@ static uint32 update_driver_init(NT_PRINTER_INFO_LEVEL *printer, uint32 level)
  got to keep the endians happy :).
 ****************************************************************************/
 
-static bool convert_driver_init( TALLOC_CTX *ctx, NT_DEVICEMODE *nt_devmode, uint8 *data, uint32 data_len )
+static bool convert_driver_init(TALLOC_CTX *mem_ctx, NT_DEVICEMODE *nt_devmode,
+				const uint8_t *data, uint32_t data_len)
 {
-	bool       result = False;
-	prs_struct ps;
-	DEVICEMODE devmode;
+	struct spoolss_DeviceMode devmode;
+	enum ndr_err_code ndr_err;
+	DATA_BLOB blob;
 
 	ZERO_STRUCT(devmode);
 
-	prs_init_empty(&ps, ctx, UNMARSHALL);
-	ps.data_p      = (char *)data;
-	ps.buffer_size = data_len;
+	blob = data_blob_const(data, data_len);
 
-	if (spoolss_io_devmode("phantom DEVMODE", &ps, 0, &devmode))
-		result = convert_devicemode("", &devmode, &nt_devmode);
-	else
-		DEBUG(10,("convert_driver_init: error parsing DEVMODE\n"));
+	ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, NULL, &devmode,
+			(ndr_pull_flags_fn_t)ndr_pull_spoolss_DeviceMode);
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+		DEBUG(10,("convert_driver_init: error parsing spoolss_DeviceMode\n"));
+		return false;
+	}
 
-	return result;
+	return convert_devicemode("", &devmode, &nt_devmode);
 }
 
 /****************************************************************************