Implemented DELETEPRINTERDATA (tested with Gerald's Win32 progs).

Jeremy.
(This used to be commit fb48efaf830626f6ef05b88f5f8a74b932ceb257)

2 files changed, 74 insertions, 0 deletions

diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c
index fd6cf11746..72ce17fee1 100755
--- a/source3/rpc_server/srv_spoolss.c
+++ b/source3/rpc_server/srv_spoolss.c
@@ -100,6 +100,37 @@ static BOOL api_spoolss_getprinterdata(pipes_struct *p)
 }
 
 /********************************************************************
+ * api_spoolss_deleteprinterdata
+ *
+ * called from the spoolss dispatcher
+ ********************************************************************/
+static BOOL api_spoolss_deleteprinterdata(pipes_struct *p)
+{
+	SPOOL_Q_DELETEPRINTERDATA q_u;
+	SPOOL_R_DELETEPRINTERDATA r_u;
+	prs_struct *data = &p->in_data.data;
+	prs_struct *rdata = &p->out_data.rdata;
+
+	ZERO_STRUCT(q_u);
+	ZERO_STRUCT(r_u);
+
+	/* read the stream and fill the struct */
+	if (!spoolss_io_q_deleteprinterdata("", &q_u, data, 0)) {
+		DEBUG(0,("spoolss_io_q_deleteprinterdata: unable to unmarshall SPOOL_Q_DELETEPRINTERDATA.\n"));
+		return False;
+	}
+	
+	r_u.status = _spoolss_deleteprinterdata( &q_u.handle, &q_u.valuename);
+
+	if (!spoolss_io_r_deleteprinterdata("", &r_u, rdata, 0)) {
+		DEBUG(0,("spoolss_io_r_deleteprinterdata: unable to marshall SPOOL_R_DELETEPRINTERDATA.\n"));
+		return False;
+	}
+
+	return True;
+}
+
+/********************************************************************
  * api_spoolss_closeprinter
  *
  * called from the spoolss dispatcher
@@ -1328,6 +1359,7 @@ struct api_struct api_spoolss_cmds[] =
  {"SPOOLSS_GETPRINTERDRIVERDIRECTORY", SPOOLSS_GETPRINTERDRIVERDIRECTORY, api_spoolss_getprinterdriverdirectory },
  {"SPOOLSS_ENUMPRINTERDATA",           SPOOLSS_ENUMPRINTERDATA,           api_spoolss_enumprinterdata           },
  {"SPOOLSS_SETPRINTERDATA",            SPOOLSS_SETPRINTERDATA,            api_spoolss_setprinterdata            },
+ {"SPOOLSS_DELETEPRINTERDATA",         SPOOLSS_DELETEPRINTERDATA,         api_spoolss_deleteprinterdata         },
  {"SPOOLSS_ADDFORM",                   SPOOLSS_ADDFORM,                   api_spoolss_addform                   },
  {"SPOOLSS_DELETEFORM",                SPOOLSS_DELETEFORM,                api_spoolss_deleteform                },
  {"SPOOLSS_GETFORM",                   SPOOLSS_GETFORM,                   api_spoolss_getform                   },
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 52a677fbe0..2c0dc79fb2 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -4681,6 +4681,48 @@ uint32 _spoolss_setprinterdata( POLICY_HND *handle,
 
 /****************************************************************************
 ****************************************************************************/
+uint32 _spoolss_deleteprinterdata( POLICY_HND *handle, const UNISTR2 *value)
+{
+	NT_PRINTER_INFO_LEVEL *printer = NULL;
+	NT_PRINTER_PARAM param;
+	int snum=0;
+	uint32 status = 0x0;
+	Printer_entry *Printer=find_printer_index_by_hnd(handle);
+	
+	DEBUG(5,("spoolss_deleteprinterdata\n"));
+	
+	if (!OPEN_HANDLE(Printer)) {
+		DEBUG(0,("_spoolss_deleteprinterdata: Invalid handle (%s).\n", OUR_HANDLE(handle)));
+		return ERROR_INVALID_HANDLE;
+	}
+
+	if (!get_printer_snum(handle, &snum))
+		return ERROR_INVALID_HANDLE;
+
+	if (!print_access_check(NULL, snum, PRINTER_ACCESS_ADMINISTER)) {
+		DEBUG(3, ("_spoolss_deleteprinterdata: security descriptor change denied by existing "
+			  "security descriptor\n"));
+		return ERROR_ACCESS_DENIED;
+	}
+
+	status = get_a_printer(&printer, 2, lp_servicename(snum));
+	if (status != 0x0)
+		return ERROR_INVALID_NAME;
+
+	ZERO_STRUCTP(&param);
+	unistr2_to_ascii(param.value, value, sizeof(param.value)-1);
+
+	if(!unlink_specific_param_if_exist(printer->info_2, &param))
+		status = ERROR_INVALID_PARAMETER;
+	else
+		status = add_a_printer(*printer, 2);
+
+	free_a_printer(&printer, 2);
+	return status;
+}
+
+/****************************************************************************
+****************************************************************************/
 uint32 _spoolss_addform( POLICY_HND *handle,
 				uint32 level,
 				const FORM *form)