Start of merge to 2_2_RELEASE branch for release.

Jeremy.

1 files changed, 815 insertions, 443 deletions

diff --git a/source/libsmb/cli_spoolss.c b/source/libsmb/cli_spoolss.c
index 16a95b69e17..c56ecf05f80 100644
--- a/source/libsmb/cli_spoolss.c
+++ b/source/libsmb/cli_spoolss.c
@@ -1,13 +1,12 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 2.2
+   Unix SMB/CIFS implementation.
    RPC pipe client
 
-   Copyright (C) Gerald Carter                2001,
-   Copyright (C) Tim Potter                   2000,
-   Copyright (C) Andrew Tridgell              1994-2000
-   Copyright (C) Luke Kenneth Casson Leighton 1996-2000
-   Copyright (C) Jean-Francois Micouleau      1999-2000
+   Copyright (C) Gerald Carter                2001-2002,
+   Copyright (C) Tim Potter                   2000-2002,
+   Copyright (C) Andrew Tridgell              1994-2000,
+   Copyright (C) Luke Kenneth Casson Leighton 1996-2000,
+   Copyright (C) Jean-Francois Micouleau      1999-2000.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,9 +25,19 @@
 
 #include "includes.h"
 
-extern pstring global_myname;
-
-/* Opens a SMB connection to the SPOOLSS pipe */
+/** @defgroup spoolss SPOOLSS - NT printing routines
+ *  @ingroup rpc_client
+ *
+ * @{
+ **/
+
+/** Opens a SMB connection and connects to the SPOOLSS pipe.
+ *
+ * @param cli Uninitialised client handle.
+ * @param system_name NETBIOS name of the machine to connect to.
+ * @param creds User credentials to connect as.
+ * @returns Initialised client handle.
+ */
 struct cli_state *cli_spoolss_initialise(struct cli_state *cli, 
 					 char *system_name,
 					 struct ntuser_creds *creds)
@@ -36,126 +45,10 @@ struct cli_state *cli_spoolss_initialise(struct cli_state *cli,
         return cli_pipe_initialise(cli, system_name, PIPE_SPOOLSS, creds);
 }
 
-/* Open printer ex */
-
-NTSTATUS cli_spoolss_open_printer_ex(
-	struct cli_state *cli, 
-	TALLOC_CTX *mem_ctx,
-	char *printername,
-	char *datatype, 
-	uint32 access_required,
-	char *station, 
-	char *username,
-	POLICY_HND *pol
-)
-{
-	prs_struct qbuf, rbuf;
-	SPOOL_Q_OPEN_PRINTER_EX q;
-	SPOOL_R_OPEN_PRINTER_EX r;
-	NTSTATUS result;
-
-	ZERO_STRUCT(q);
-	ZERO_STRUCT(r);
-
-	/* Initialise parse structures */
-
-	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-	/* Initialise input parameters */
-
-        make_spoolss_q_open_printer_ex(&q, printername, datatype,
-                                       access_required, station, username);
-	
-	/* Marshall data and send request */
-
-	if (!spoolss_io_q_open_printer_ex("", &q, &qbuf, 0) ||
-	    !rpc_api_pipe_req(cli, SPOOLSS_OPENPRINTEREX, &qbuf, &rbuf)) {
-		result = NT_STATUS_UNSUCCESSFUL;
-		goto done;
-	}
-
-	/* Unmarshall response */
-
-	if (!spoolss_io_r_open_printer_ex("", &r, &rbuf, 0)) {
-		result = NT_STATUS_UNSUCCESSFUL;
-		goto done;
-	}
-
-	/* Return output parameters */
-
-	if (W_ERROR_IS_OK(r.status)) {
-		result = NT_STATUS_OK;
-		*pol = r.handle;
-	} else {
-		result = werror_to_ntstatus(r.status);
-	}
-
- done:
-	prs_mem_free(&qbuf);
-	prs_mem_free(&rbuf);
-
-	return result;
-}
-
-/* Close a printer handle */
-
-NTSTATUS cli_spoolss_close_printer(
-	struct cli_state *cli,
-	TALLOC_CTX *mem_ctx,
-	POLICY_HND *pol
-)
-{
-	prs_struct qbuf, rbuf;
-	SPOOL_Q_CLOSEPRINTER q;
-	SPOOL_R_CLOSEPRINTER r;
-	NTSTATUS result;
-
-	ZERO_STRUCT(q);
-	ZERO_STRUCT(r);
-
-	/* Initialise parse structures */
-
-	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-	/* Initialise input parameters */
-
-        make_spoolss_q_closeprinter(&q, pol);
-	
-	/* Marshall data and send request */
-
-	if (!spoolss_io_q_closeprinter("", &q, &qbuf, 0) ||
-	    !rpc_api_pipe_req(cli, SPOOLSS_CLOSEPRINTER, &qbuf, &rbuf)) {
-		result = NT_STATUS_UNSUCCESSFUL;
-		goto done;
-	}
-
-	/* Unmarshall response */
-
-	if (!spoolss_io_r_closeprinter("", &r, &rbuf, 0)) {
-		result = NT_STATUS_UNSUCCESSFUL;
-		goto done;
-	}
-
-	/* Return output parameters */
-
-	if (W_ERROR_IS_OK(r.status)) {
-		*pol = r.handle;
-		result = NT_STATUS_OK;
-	} else {
-		result = werror_to_ntstatus(r.status);
-	}
-
- done:
-	prs_mem_free(&qbuf);
-	prs_mem_free(&rbuf);
-
-	return result;
-}
-
-/* Initialize a spoolss NEW_BUFFER */
 
+/**********************************************************************
+ Initialize a new spoolss buff for use by a client rpc
+**********************************************************************/
 static void init_buffer(NEW_BUFFER *buffer, uint32 size, TALLOC_CTX *ctx)
 {
 	buffer->ptr = (size != 0);
@@ -165,15 +58,14 @@ static void init_buffer(NEW_BUFFER *buffer, uint32 size, TALLOC_CTX *ctx)
 	buffer->struct_start = prs_offset(&buffer->prs);
 }
 
-/* Decode various printer info levels - perhaps this should live in
-   parse_spoolss.c? */
+/********************************************************************* 
+ Decode various spoolss rpc's and info levels 
+ ********************************************************************/
 
-static void decode_printer_info_0(
-	TALLOC_CTX *mem_ctx,
-	NEW_BUFFER *buffer, 
-	uint32 returned, 
-	PRINTER_INFO_0 **info
-)
+/**********************************************************************
+**********************************************************************/
+static void decode_printer_info_0(TALLOC_CTX *mem_ctx, NEW_BUFFER *buffer, 
+				uint32 returned, PRINTER_INFO_0 **info)
 {
         uint32 i;
         PRINTER_INFO_0  *inf;
@@ -189,12 +81,10 @@ static void decode_printer_info_0(
         *info=inf;
 }
 
-static void decode_printer_info_1(
-	TALLOC_CTX *mem_ctx,
-	NEW_BUFFER *buffer, 
-	uint32 returned, 
-	PRINTER_INFO_1 **info
-)
+/**********************************************************************
+**********************************************************************/
+static void decode_printer_info_1(TALLOC_CTX *mem_ctx, NEW_BUFFER *buffer, 
+				uint32 returned, PRINTER_INFO_1 **info)
 {
         uint32 i;
         PRINTER_INFO_1  *inf;
@@ -210,12 +100,10 @@ static void decode_printer_info_1(
         *info=inf;
 }
 
-static void decode_printer_info_2(
-	TALLOC_CTX *mem_ctx,
-	NEW_BUFFER *buffer, 
-	uint32 returned, 
-	PRINTER_INFO_2 **info
-)
+/**********************************************************************
+**********************************************************************/
+static void decode_printer_info_2(TALLOC_CTX *mem_ctx, NEW_BUFFER *buffer, 
+				uint32 returned, PRINTER_INFO_2 **info)
 {
         uint32 i;
         PRINTER_INFO_2  *inf;
@@ -233,12 +121,10 @@ static void decode_printer_info_2(
         *info=inf;
 }
 
-static void decode_printer_info_3(
-	TALLOC_CTX *mem_ctx,
-	NEW_BUFFER *buffer, 
-	uint32 returned, 
-	PRINTER_INFO_3 **info
-)
+/**********************************************************************
+**********************************************************************/
+static void decode_printer_info_3(TALLOC_CTX *mem_ctx, NEW_BUFFER *buffer, 
+				uint32 returned, PRINTER_INFO_3 **info)
 {
         uint32 i;
         PRINTER_INFO_3  *inf;
@@ -256,14 +142,9 @@ static void decode_printer_info_3(
 }
 
 /**********************************************************************
- Decode a PORT_INFO_1 struct from a NEW_BUFFER 
 **********************************************************************/
-static void decode_port_info_1(
-	TALLOC_CTX *mem_ctx,
-	NEW_BUFFER *buffer, 
-	uint32 returned, 
-	PORT_INFO_1 **info
-)
+static void decode_port_info_1(TALLOC_CTX *mem_ctx, NEW_BUFFER *buffer, 
+			uint32 returned, PORT_INFO_1 **info)
 {
         uint32 i;
         PORT_INFO_1 *inf;
@@ -280,13 +161,9 @@ static void decode_port_info_1(
 }
 
 /**********************************************************************
- Decode a PORT_INFO_2 struct from a NEW_BUFFER 
 **********************************************************************/
-static void decode_port_info_2(
-	TALLOC_CTX *mem_ctx,
-	NEW_BUFFER *buffer, 
-	uint32 returned, 
-	PORT_INFO_2 **info)
+static void decode_port_info_2(TALLOC_CTX *mem_ctx, NEW_BUFFER *buffer, 
+			uint32 returned, PORT_INFO_2 **info)
 {
         uint32 i;
         PORT_INFO_2 *inf;
@@ -302,12 +179,10 @@ static void decode_port_info_2(
         *info=inf;
 }
 
-static void decode_printer_driver_1(
-	TALLOC_CTX *mem_ctx,
-	NEW_BUFFER *buffer, 
-	uint32 returned, 
-	DRIVER_INFO_1 **info
-)
+/**********************************************************************
+**********************************************************************/
+static void decode_printer_driver_1(TALLOC_CTX *mem_ctx, NEW_BUFFER *buffer, 
+			uint32 returned, DRIVER_INFO_1 **info)
 {
         uint32 i;
         DRIVER_INFO_1 *inf;
@@ -323,12 +198,10 @@ static void decode_printer_driver_1(
         *info=inf;
 }
 
-static void decode_printer_driver_2(
-	TALLOC_CTX *mem_ctx,
-	NEW_BUFFER *buffer, 
-	uint32 returned, 
-	DRIVER_INFO_2 **info
-)
+/**********************************************************************
+**********************************************************************/
+static void decode_printer_driver_2(TALLOC_CTX *mem_ctx, NEW_BUFFER *buffer, 
+			uint32 returned, DRIVER_INFO_2 **info)
 {
         uint32 i;
         DRIVER_INFO_2 *inf;
@@ -344,12 +217,10 @@ static void decode_printer_driver_2(
         *info=inf;
 }
 
-static void decode_printer_driver_3(
-	TALLOC_CTX *mem_ctx,
-	NEW_BUFFER *buffer, 
-	uint32 returned, 
-	DRIVER_INFO_3 **info
-)
+/**********************************************************************
+**********************************************************************/
+static void decode_printer_driver_3(TALLOC_CTX *mem_ctx, NEW_BUFFER *buffer, 
+			uint32 returned, DRIVER_INFO_3 **info)
 {
         uint32 i;
         DRIVER_INFO_3 *inf;
@@ -365,11 +236,10 @@ static void decode_printer_driver_3(
         *info=inf;
 }
 
-static void decode_printerdriverdir_1 (
-	TALLOC_CTX *mem_ctx,
-	NEW_BUFFER *buffer, 
-	uint32 returned, 
-	DRIVER_DIRECTORY_1 **info
+/**********************************************************************
+**********************************************************************/
+static void decode_printerdriverdir_1 (TALLOC_CTX *mem_ctx, NEW_BUFFER *buffer,
+			uint32 returned, DRIVER_DIRECTORY_1 **info
 )
 {
 	DRIVER_DIRECTORY_1 *inf;
@@ -383,24 +253,169 @@ static void decode_printerdriverdir_1 (
 	*info=inf;
 }
 
+/** Return a handle to the specified printer or print server.
+ *
+ * @param cli              Pointer to client state structure which is open
+ * on the SPOOLSS pipe.
+ *
+ * @param mem_ctx          Pointer to an initialised talloc context.
+ *
+ * @param printername      The name of the printer or print server to be
+ * opened in UNC format.
+ *
+ * @param datatype         Specifies the default data type for the printer.
+ *
+ * @param access_required  The access rights requested on the printer or
+ * print server.
+ *
+ * @param station          The UNC name of the requesting workstation.
+ *
+ * @param username         The name of the user requesting the open.
+ *
+ * @param pol              Returned policy handle.
+ */
+
+/*********************************************************************************
+ Win32 API - OpenPrinter()
+ ********************************************************************************/
+ 
+WERROR cli_spoolss_open_printer_ex(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+				char *printername, char *datatype, uint32 access_required,
+				char *station, char *username, POLICY_HND *pol)
+{
+	prs_struct qbuf, rbuf;
+	SPOOL_Q_OPEN_PRINTER_EX q;
+	SPOOL_R_OPEN_PRINTER_EX r;
+	WERROR result = W_ERROR(ERRgeneral);
+
+	ZERO_STRUCT(q);
+	ZERO_STRUCT(r);
 
-/* Enumerate printers */
+	/* Initialise parse structures */
 
-NTSTATUS cli_spoolss_enum_printers(
-	struct cli_state *cli, 
-	TALLOC_CTX *mem_ctx,
-	uint32 flags,
-	uint32 level, 
-	int *returned, 
-	PRINTER_INFO_CTR *ctr
-)
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+
+	/* Initialise input parameters */
+
+        make_spoolss_q_open_printer_ex(&q, printername, datatype,
+                                       access_required, station, username);
+	
+	/* Marshall data and send request */
+
+	if (!spoolss_io_q_open_printer_ex("", &q, &qbuf, 0) ||
+	    !rpc_api_pipe_req(cli, SPOOLSS_OPENPRINTEREX, &qbuf, &rbuf))
+		goto done;
+
+	/* Unmarshall response */
+
+	if (!spoolss_io_r_open_printer_ex("", &r, &rbuf, 0))
+		goto done;
+
+	/* Return output parameters */
+
+	result = r.status;
+
+	if (W_ERROR_IS_OK(result))
+		*pol = r.handle;
+
+ done:
+	prs_mem_free(&qbuf);
+	prs_mem_free(&rbuf);
+
+	return result;
+}
+
+/** Close a printer handle
+ *
+ * @param cli              Pointer to client state structure which is open
+ * on the SPOOLSS pipe.
+ *
+ * @param mem_ctx          Pointer to an initialised talloc context.
+ *
+ * @param pol              Policy handle of printer or print server to close.
+ */
+/*********************************************************************************
+ Win32 API - ClosePrinter()
+ ********************************************************************************/
+
+WERROR cli_spoolss_close_printer(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+				POLICY_HND *pol)
+{
+	prs_struct qbuf, rbuf;
+	SPOOL_Q_CLOSEPRINTER q;
+	SPOOL_R_CLOSEPRINTER r;
+	WERROR result = W_ERROR(ERRgeneral);
+
+	ZERO_STRUCT(q);
+	ZERO_STRUCT(r);
+
+	/* Initialise parse structures */
+
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+
+	/* Initialise input parameters */
+
+        make_spoolss_q_closeprinter(&q, pol);
+	
+	/* Marshall data and send request */
+
+	if (!spoolss_io_q_closeprinter("", &q, &qbuf, 0) ||
+	    !rpc_api_pipe_req(cli, SPOOLSS_CLOSEPRINTER, &qbuf, &rbuf))
+		goto done;
+
+	/* Unmarshall response */
+
+	if (!spoolss_io_r_closeprinter("", &r, &rbuf, 0))
+		goto done;
+
+	/* Return output parameters */
+
+	result = r.status;
+
+	if (W_ERROR_IS_OK(result))
+		*pol = r.handle;
+
+ done:
+	prs_mem_free(&qbuf);
+	prs_mem_free(&rbuf);
+
+	return result;
+}
+
+/** Enumerate printers on a print server.
+ *
+ * @param cli              Pointer to client state structure which is open
+ *                         on the SPOOLSS pipe.
+ * @param mem_ctx          Pointer to an initialised talloc context.
+ *
+ * @param offered          Buffer size offered in the request.
+ * @param needed           Number of bytes needed to complete the request.
+ *                         may be NULL.
+ *
+ * @param flags            Selected from PRINTER_ENUM_* flags.
+ * @param level            Request information level.
+ *
+ * @param num_printers     Pointer to number of printers returned.  May be
+ *                         NULL.
+ * @param ctr              Return structure for printer information.  May
+ *                         be NULL.
+ */
+/*********************************************************************************
+ Win32 API - EnumPrinters()
+ ********************************************************************************/
+
+WERROR cli_spoolss_enum_printers(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+				 uint32 offered, uint32 *needed,
+				 uint32 flags, uint32 level,
+				 uint32 *num_printers, PRINTER_INFO_CTR *ctr)
 {
 	prs_struct qbuf, rbuf;
 	SPOOL_Q_ENUMPRINTERS q;
         SPOOL_R_ENUMPRINTERS r;
 	NEW_BUFFER buffer;
-	uint32 needed = 0x1068;
-	NTSTATUS result;
+	WERROR result = W_ERROR(ERRgeneral);
 	fstring server;
 
 	ZERO_STRUCT(q);
@@ -409,39 +424,47 @@ NTSTATUS cli_spoolss_enum_printers(
 	fstrcpy (server, cli->desthost);
 	strupper (server);
 	
-	do {
 		/* Initialise input parameters */
 
-		init_buffer(&buffer, needed, mem_ctx);
+	init_buffer(&buffer, offered, mem_ctx);
 
 		prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
 		prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 
 		make_spoolss_q_enumprinters(&q, flags, server, level, &buffer, 
-					    needed);
+				    offered);
 
 		/* Marshall data and send request */
 
 		if (!spoolss_io_q_enumprinters("", &q, &qbuf, 0) ||
-		    !rpc_api_pipe_req(cli, SPOOLSS_ENUMPRINTERS, &qbuf, &rbuf)) {
-			result = NT_STATUS_UNSUCCESSFUL;
+	    !rpc_api_pipe_req(cli, SPOOLSS_ENUMPRINTERS, &qbuf, &rbuf))
 			goto done;
-		}
 
 		/* Unmarshall response */
+
 		if (spoolss_io_r_enumprinters("", &r, &rbuf, 0)) {
-			needed = r.needed;
+		if (needed)
+			*needed = r.needed;
 		}
 		
-		result = werror_to_ntstatus(r.status);
+	result = r.status;
 		
-		if (NT_STATUS_V(result)==NT_STATUS_V(ERROR_INSUFFICIENT_BUFFER) || !W_ERROR_IS_OK(result))
+	/* Return output parameters */
+
+	if (!W_ERROR_IS_OK(r.status))
 			goto done;
 	
-		/* Return output parameters */
+	if (num_printers)
+		*num_printers = r.returned;
+
+	if (!ctr)
+		goto done;
 
-		if ((*returned = r.returned)) {
 			switch (level) {
+			case 0:
+				decode_printer_info_0(mem_ctx, r.buffer, r.returned, 
+						      &ctr->printers_0);
+				break;
 			case 1:
 				decode_printer_info_1(mem_ctx, r.buffer, r.returned, 
 						      &ctr->printers_1);
@@ -455,32 +478,43 @@ NTSTATUS cli_spoolss_enum_printers(
 						      &ctr->printers_3);
 				break;
 			}			
-		}
 
 	done:
 		prs_mem_free(&qbuf);
 		prs_mem_free(&rbuf);
 
-	} while (NT_STATUS_V(result) == NT_STATUS_V(ERROR_INSUFFICIENT_BUFFER));
-
 	return result;	
 }
 
-/* Enumerate printer ports */
-NTSTATUS cli_spoolss_enum_ports(
-	struct cli_state *cli, 
-	TALLOC_CTX *mem_ctx,
-	uint32 level, 
-	int *returned, 
-	PORT_INFO_CTR *ctr
-)
+/*********************************************************************************
+ Win32 API - EnumPorts()
+ ********************************************************************************/
+/** Enumerate printer ports on a print server.
+ *
+ * @param cli              Pointer to client state structure which is open
+ *                         on the SPOOLSS pipe.
+ * @param mem_ctx          Pointer to an initialised talloc context.
+ *
+ * @param offered          Buffer size offered in the request.
+ * @param needed           Number of bytes needed to complete the request.
+ *                         May be NULL.
+ *
+ * @param level            Requested information level.
+ *
+ * @param num_ports        Pointer to number of ports returned.  May be NULL.
+ * @param ctr              Pointer to structure holding port information.
+ *                         May be NULL.
+ */
+
+WERROR cli_spoolss_enum_ports(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+			      uint32 offered, uint32 *needed,
+			      uint32 level, int *num_ports, PORT_INFO_CTR *ctr)
 {
 	prs_struct qbuf, rbuf;
 	SPOOL_Q_ENUMPORTS q;
         SPOOL_R_ENUMPORTS r;
 	NEW_BUFFER buffer;
-	uint32 needed = 100;
-	NTSTATUS result;
+	WERROR result = W_ERROR(ERRgeneral);
 	fstring server;
 
 	ZERO_STRUCT(q);
@@ -489,36 +523,40 @@ NTSTATUS cli_spoolss_enum_ports(
         slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
         strupper (server);
 
-	do {
 		/* Initialise input parameters */
 
-		init_buffer(&buffer, needed, mem_ctx);
+	init_buffer(&buffer, offered, mem_ctx);
 
 		prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
 		prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 
-		make_spoolss_q_enumports(&q, server, level, &buffer, needed);
+	make_spoolss_q_enumports(&q, server, level, &buffer, offered);
 
 		/* Marshall data and send request */
 
 		if (!spoolss_io_q_enumports("", &q, &qbuf, 0) ||
-		    !rpc_api_pipe_req(cli, SPOOLSS_ENUMPORTS, &qbuf, &rbuf)) {
-			result = NT_STATUS_UNSUCCESSFUL;
+	    !rpc_api_pipe_req(cli, SPOOLSS_ENUMPORTS, &qbuf, &rbuf))
 			goto done;
-		}
 
 		/* Unmarshall response */
+
 		if (spoolss_io_r_enumports("", &r, &rbuf, 0)) {
-			needed = r.needed;
+		if (needed)
+			*needed = r.needed;
 		}
 		
+	result = r.status;
+
 		/* Return output parameters */
-		result = werror_to_ntstatus(r.status);
 
-		if (NT_STATUS_IS_OK(result) &&
-		    r.returned > 0) {
+	if (!W_ERROR_IS_OK(result))
+		goto done;
 
-			*returned = r.returned;
+	if (num_ports)
+		*num_ports = r.returned;
+
+	if (!ctr)
+		goto done;
 
 			switch (level) {
 			case 1:
@@ -530,56 +568,58 @@ NTSTATUS cli_spoolss_enum_ports(
 						   &ctr->port.info_2);
 				break;
 			}			
-		}
 
 	done:
 		prs_mem_free(&qbuf);
 		prs_mem_free(&rbuf);
 
-	} while (NT_STATUS_V(result) == NT_STATUS_V(ERROR_INSUFFICIENT_BUFFER));
-
 	return result;	
 }
 
-/* Get printer info */
-NTSTATUS cli_spoolss_getprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-				POLICY_HND *pol, uint32 level, PRINTER_INFO_CTR *ctr)
+/*********************************************************************************
+ Win32 API - GetPrinter()
+ ********************************************************************************/
+
+WERROR cli_spoolss_getprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+			      uint32 offered, uint32 *needed,
+			      POLICY_HND *pol, uint32 level, 
+			      PRINTER_INFO_CTR *ctr)
 {
 	prs_struct qbuf, rbuf;
 	SPOOL_Q_GETPRINTER q;
 	SPOOL_R_GETPRINTER r;
 	NEW_BUFFER buffer;
-	uint32 needed = 0x1068;
-	NTSTATUS result;
+	WERROR result = W_ERROR(ERRgeneral);
 
 	ZERO_STRUCT(q);
 	ZERO_STRUCT(r);
 
-	do {
 		/* Initialise input parameters */
 
-		init_buffer(&buffer, needed, mem_ctx);
+	init_buffer(&buffer, offered, mem_ctx);
 
 		prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
 		prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 
-		make_spoolss_q_getprinter(mem_ctx, &q, pol, level, &buffer, needed);
+	make_spoolss_q_getprinter(mem_ctx, &q, pol, level, &buffer, offered);
 
 		/* Marshall data and send request */
+
 		if (!spoolss_io_q_getprinter("", &q, &qbuf, 0) ||
 		    !rpc_api_pipe_req(cli, SPOOLSS_GETPRINTER, &qbuf, &rbuf)) 
-		{
-			result = NT_STATUS_UNSUCCESSFUL;
 			goto done;
-		}
 
 		/* Unmarshall response */
-		if (spoolss_io_r_getprinter("", &r, &rbuf, 0)) {
-			needed = r.needed;
-		}
+
+	if (!spoolss_io_r_getprinter("", &r, &rbuf, 0))
+		goto done;
+
+	if (needed)
+		*needed = r.needed;
 		
 		/* Return output parameters */
-		result = werror_to_ntstatus(r.status);
+
+	result = r.status;
 		
 		if (NT_STATUS_IS_OK(result)) {
 			switch (level) {
@@ -602,22 +642,35 @@ NTSTATUS cli_spoolss_getprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 		prs_mem_free(&qbuf);
 		prs_mem_free(&rbuf);
 
-	} while (NT_STATUS_V(result) == NT_STATUS_V(ERROR_INSUFFICIENT_BUFFER));
-
 	return result;	
 }
 
-/**********************************************************************
- * Set printer info 
+/*********************************************************************************
+ Win32 API - SetPrinter()
+ ********************************************************************************/
+/** Set printer info 
+ *
+ * @param cli              Pointer to client state structure which is open
+ *                         on the SPOOLSS pipe.
+ * @param mem_ctx          Pointer to an initialised talloc context.
+ *
+ * @param pol              Policy handle on printer to set info.
+ * @param level            Information level to set.
+ * @param ctr              Pointer to structure holding printer information.
+ * @param command          Specifies the action performed.  See
+ * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/gdi/prntspol_13ua.asp 
+ * for details.
+ *
  */
-NTSTATUS cli_spoolss_setprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-				POLICY_HND *pol, uint32 level, PRINTER_INFO_CTR *ctr,
-				uint32 command)
+ 
+WERROR cli_spoolss_setprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+			      POLICY_HND *pol, uint32 level, 
+			      PRINTER_INFO_CTR *ctr, uint32 command)
 {
 	prs_struct qbuf, rbuf;
 	SPOOL_Q_SETPRINTER q;
 	SPOOL_R_SETPRINTER r;
-	NTSTATUS result = NT_STATUS_ACCESS_DENIED;
+	WERROR result = W_ERROR(ERRgeneral);
 
 	ZERO_STRUCT(q);
 	ZERO_STRUCT(r);
@@ -629,20 +682,17 @@ NTSTATUS cli_spoolss_setprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 	make_spoolss_q_setprinter(mem_ctx, &q, pol, level, ctr, command);
 
 	/* Marshall data and send request */
+
 	if (!spoolss_io_q_setprinter("", &q, &qbuf, 0) ||
 	    !rpc_api_pipe_req(cli, SPOOLSS_SETPRINTER, &qbuf, &rbuf)) 
-	{
-		result = NT_STATUS_ACCESS_DENIED;
 		goto done;
-	}
 
 	/* Unmarshall response */
+
 	if (!spoolss_io_r_setprinter("", &r, &rbuf, 0)) 
-	{
 		goto done;
-	}
 	
-	result = werror_to_ntstatus(r.status);
+	result = r.status;
 		
 done:
 	prs_mem_free(&qbuf);
@@ -652,19 +702,39 @@ done:
 	return result;	
 }
 
-/**********************************************************************
- * Get installed printer drivers for a given printer
+/*********************************************************************************
+ Win32 API - GetPrinterDriver()
+ ********************************************************************************/
+/** Get installed printer drivers for a given printer
+ *
+ * @param cli              Pointer to client state structure which is open
+ * on the SPOOLSS pipe.
+ *
+ * @param mem_ctx          Pointer to an initialised talloc context.
+ *
+ * @param offered          Buffer size offered in the request.
+ * @param needed           Number of bytes needed to complete the request.
+ *                         may be NULL.
+ *
+ * @param pol              Pointer to an open policy handle for the printer
+ *                         opened with cli_spoolss_open_printer_ex().
+ * @param level            Requested information level.
+ * @param env              The print environment or archictecture.  This is
+ *                         "Windows NT x86" for NT4.
+ * @param ctr              Returned printer driver information.
  */
-NTSTATUS cli_spoolss_getprinterdriver (struct cli_state *cli, TALLOC_CTX *mem_ctx,
-					POLICY_HND *pol, uint32 level, char* env,
-					PRINTER_DRIVER_CTR *ctr)
+
+WERROR cli_spoolss_getprinterdriver(struct cli_state *cli, 
+				    TALLOC_CTX *mem_ctx, 
+				    uint32 offered, uint32 *needed,
+				    POLICY_HND *pol, uint32 level, 
+				    char *env, PRINTER_DRIVER_CTR *ctr)
 {
 	prs_struct qbuf, rbuf;
 	SPOOL_Q_GETPRINTERDRIVER2 q;
         SPOOL_R_GETPRINTERDRIVER2 r;
 	NEW_BUFFER buffer;
-	uint32 needed = 0x1068;
-	NTSTATUS result;
+	WERROR result = W_ERROR(ERRgeneral);
 	fstring server;
 
 	ZERO_STRUCT(q);
@@ -673,40 +743,40 @@ NTSTATUS cli_spoolss_getprinterdriver (struct cli_state *cli, TALLOC_CTX *mem_ct
 	fstrcpy (server, cli->desthost);
 	strupper (server);
 
-	do 
-	{
 		/* Initialise input parameters */
 
-		init_buffer(&buffer, needed, mem_ctx);
+	init_buffer(&buffer, offered, mem_ctx);
 
 		prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
 		prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 
+	make_spoolss_q_getprinterdriver2(&q, pol, env, level, 2, 2,
+					 &buffer, offered);
 
-		/* write the request */
-		make_spoolss_q_getprinterdriver2(&q, pol, env, level, 2, 2, &buffer, needed);
+	/* Marshall data and send request */
 
-		/* Marshall data and send request */
 		if (!spoolss_io_q_getprinterdriver2 ("", &q, &qbuf, 0) ||
 		    !rpc_api_pipe_req (cli, SPOOLSS_GETPRINTERDRIVER2, &qbuf, &rbuf)) 
-		{
-			result = NT_STATUS_UNSUCCESSFUL;
 			goto done;
-		}
 
 		/* Unmarshall response */
-		if (spoolss_io_r_getprinterdriver2 ("", &r, &rbuf, 0)) 
-		{
-			needed = r.needed;
+
+	if (spoolss_io_r_getprinterdriver2 ("", &r, &rbuf, 0)) {
+		if (needed)
+			*needed = r.needed;
 		}
 		
+	result = r.status;
+
 		/* Return output parameters */
-		result = werror_to_ntstatus(r.status);
 		
-		if (NT_STATUS_IS_OK(result))
-		{
-			switch (level) 
-			{
+	if (!W_ERROR_IS_OK(result))
+		goto done;
+
+	if (!ctr)
+		goto done;
+
+	switch (level) {
 			case 1:
 				decode_printer_driver_1(mem_ctx, r.buffer, 1, &ctr->info1);
 				break;
@@ -717,35 +787,32 @@ NTSTATUS cli_spoolss_getprinterdriver (struct cli_state *cli, TALLOC_CTX *mem_ct
 				decode_printer_driver_3(mem_ctx, r.buffer, 1, &ctr->info3);
 				break;
 			}			
-		}
 
 	done:
 		prs_mem_free(&qbuf);
 		prs_mem_free(&rbuf);
 
-	} while (NT_STATUS_V(result) == NT_STATUS_V(ERROR_INSUFFICIENT_BUFFER));
-
 	return result;	
 }
 
+/*********************************************************************************
+ Win32 API - EnumPrinterDrivers()
+ ********************************************************************************/
 /**********************************************************************
  * Get installed printer drivers for a given printer
  */
-NTSTATUS cli_spoolss_enumprinterdrivers (
-	struct cli_state 	*cli, 
-	TALLOC_CTX		*mem_ctx,
-	uint32 			level,
-	char* 			env,
-	uint32			*returned,
-	PRINTER_DRIVER_CTR  	*ctr
-)
+WERROR cli_spoolss_enumprinterdrivers (struct cli_state *cli, 
+				       TALLOC_CTX *mem_ctx,
+				       uint32 offered, uint32 *needed,
+				       uint32 level, char *env,
+				       uint32 *num_drivers,
+				PRINTER_DRIVER_CTR *ctr)
 {
 	prs_struct 			qbuf, rbuf;
 	SPOOL_Q_ENUMPRINTERDRIVERS 	q;
         SPOOL_R_ENUMPRINTERDRIVERS 	r;
 	NEW_BUFFER 			buffer;
-	uint32 				needed = 0;
-	NTSTATUS 			result;
+	WERROR result = W_ERROR(ERRgeneral);
 	fstring 			server;
 
 	ZERO_STRUCT(q);
@@ -754,41 +821,43 @@ NTSTATUS cli_spoolss_enumprinterdrivers (
         slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
         strupper (server);
 
-	do 
-	{
 		/* Initialise input parameters */
-		init_buffer(&buffer, needed, mem_ctx);
+
+	init_buffer(&buffer, offered, mem_ctx);
 
 		prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
 		prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 
+	/* Write the request */
 
-		/* write the request */
-		make_spoolss_q_enumprinterdrivers(&q, server, env, level, &buffer, needed);
+	make_spoolss_q_enumprinterdrivers(&q, server, env, level, &buffer, 
+					  offered);
 
 		/* Marshall data and send request */
+	
 		if (!spoolss_io_q_enumprinterdrivers ("", &q, &qbuf, 0) ||
 		    !rpc_api_pipe_req (cli, SPOOLSS_ENUMPRINTERDRIVERS, &qbuf, &rbuf)) 
-		{
-			result = NT_STATUS_UNSUCCESSFUL;
 			goto done;
-		}
 
 		/* Unmarshall response */
-		if (spoolss_io_r_enumprinterdrivers ("", &r, &rbuf, 0)) 
-		{
-			needed = r.needed;
-		}
+
+	if (!spoolss_io_r_enumprinterdrivers ("", &r, &rbuf, 0))
+		goto done;
+
+	if (needed)
+		*needed = r.needed;
+
+	if (num_drivers)
+		*num_drivers = r.returned;
+
+	result = r.status;
 		
 		/* Return output parameters */
-		result = werror_to_ntstatus(r.status);
-		if (NT_STATUS_IS_OK(result) && 
-		    (r.returned != 0))
-		{
-			*returned = r.returned;
-
-			switch (level) 
-			{
+
+	if (W_ERROR_IS_OK(result) && (r.returned != 0)) {
+		*num_drivers = r.returned;
+
+		switch (level) {
 			case 1:
 				decode_printer_driver_1(mem_ctx, r.buffer, r.returned, &ctr->info1);
 				break;
@@ -805,29 +874,27 @@ NTSTATUS cli_spoolss_enumprinterdrivers (
 		prs_mem_free(&qbuf);
 		prs_mem_free(&rbuf);
 
-	} while (NT_STATUS_V(result) == NT_STATUS_V(ERROR_INSUFFICIENT_BUFFER));
-
 	return result;	
 }
 
 
+/*********************************************************************************
+ Win32 API - GetPrinterDriverDirectory()
+ ********************************************************************************/
 /**********************************************************************
  * Get installed printer drivers for a given printer
  */
-NTSTATUS cli_spoolss_getprinterdriverdir (
-	struct cli_state 	*cli, 
-	TALLOC_CTX		*mem_ctx,
-	uint32 			level,
-	char* 			env,
-	DRIVER_DIRECTORY_CTR  	*ctr
-)
+WERROR cli_spoolss_getprinterdriverdir (struct cli_state *cli, 
+					TALLOC_CTX *mem_ctx,
+					uint32 offered, uint32 *needed,
+					uint32 level, char *env,
+					DRIVER_DIRECTORY_CTR *ctr)
 {
 	prs_struct 			qbuf, rbuf;
 	SPOOL_Q_GETPRINTERDRIVERDIR 	q;
         SPOOL_R_GETPRINTERDRIVERDIR 	r;
 	NEW_BUFFER 			buffer;
-	uint32 				needed = 100;
-	NTSTATUS 			result;
+	WERROR result = W_ERROR(ERRgeneral);
 	fstring 			server;
 
 	ZERO_STRUCT(q);
@@ -836,40 +903,41 @@ NTSTATUS cli_spoolss_getprinterdriverdir (
         slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
         strupper (server);
 
-	do 
-	{
 		/* Initialise input parameters */
-		init_buffer(&buffer, needed, mem_ctx);
+
+	init_buffer(&buffer, offered, mem_ctx);
 
 		prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
 		prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 
+	/* Write the request */
 
-		/* write the request */
-		make_spoolss_q_getprinterdriverdir(&q, server, env, level, &buffer, needed);
+	make_spoolss_q_getprinterdriverdir(&q, server, env, level, &buffer, 
+					   offered);
 
 		/* Marshall data and send request */
+
 		if (!spoolss_io_q_getprinterdriverdir ("", &q, &qbuf, 0) ||
-		    !rpc_api_pipe_req (cli, SPOOLSS_GETPRINTERDRIVERDIRECTORY, &qbuf, &rbuf)) 
-		{
-			result = NT_STATUS_UNSUCCESSFUL;
+	    !rpc_api_pipe_req (cli, SPOOLSS_GETPRINTERDRIVERDIRECTORY,
+			       &qbuf, &rbuf)) 
 			goto done;
-		}
 
 		/* Unmarshall response */
-		if (spoolss_io_r_getprinterdriverdir ("", &r, &rbuf, 0)) 
-		{
-			needed = r.needed;
+
+	if (spoolss_io_r_getprinterdriverdir ("", &r, &rbuf, 0)) {
+		if (needed)
+			*needed = r.needed;
 		}
 		
 		/* Return output parameters */
-		result = werror_to_ntstatus(r.status);
-		if (NT_STATUS_IS_OK(result))
-		{
-			switch (level) 
-			{
+
+	result = r.status;
+
+	if (W_ERROR_IS_OK(result)) {
+		switch (level) {
 			case 1:
-				decode_printerdriverdir_1(mem_ctx, r.buffer, 1, &ctr->info1);
+			decode_printerdriverdir_1(mem_ctx, r.buffer, 1, 
+						  &ctr->info1);
 				break;
 			}			
 		}
@@ -878,25 +946,23 @@ NTSTATUS cli_spoolss_getprinterdriverdir (
 		prs_mem_free(&qbuf);
 		prs_mem_free(&rbuf);
 
-	} while (NT_STATUS_V(result) == NT_STATUS_V(ERROR_INSUFFICIENT_BUFFER));
-
 	return result;	
 }
 
+/*********************************************************************************
+ Win32 API - AddPrinterDriver()
+ ********************************************************************************/
 /**********************************************************************
  * Install a printer driver
  */
-NTSTATUS cli_spoolss_addprinterdriver (
-	struct cli_state 	*cli, 
-	TALLOC_CTX		*mem_ctx,
-	uint32 			level,
-	PRINTER_DRIVER_CTR  	*ctr
-)
+WERROR cli_spoolss_addprinterdriver (struct cli_state *cli, 
+				     TALLOC_CTX *mem_ctx, uint32 level,
+				     PRINTER_DRIVER_CTR *ctr)
 {
 	prs_struct 			qbuf, rbuf;
 	SPOOL_Q_ADDPRINTERDRIVER 	q;
         SPOOL_R_ADDPRINTERDRIVER 	r;
-	NTSTATUS 			result = NT_STATUS_UNSUCCESSFUL;
+	WERROR result = W_ERROR(ERRgeneral);
 	fstring 			server;
 
 	ZERO_STRUCT(q);
@@ -909,28 +975,24 @@ NTSTATUS cli_spoolss_addprinterdriver (
 	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
 	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 
+	/* Write the request */
 
-	/* write the request */
 	make_spoolss_q_addprinterdriver (mem_ctx, &q, server, level, ctr);
 
 	/* Marshall data and send request */
-	result = NT_STATUS_UNSUCCESSFUL;
+
 	if (!spoolss_io_q_addprinterdriver ("", &q, &qbuf, 0) ||
 	    !rpc_api_pipe_req (cli, SPOOLSS_ADDPRINTERDRIVER, &qbuf, &rbuf)) 
-	{
 		goto done;
-	}
 
-		
 	/* Unmarshall response */
-	result = NT_STATUS_UNSUCCESSFUL;
+		
 	if (!spoolss_io_r_addprinterdriver ("", &r, &rbuf, 0))
-	{
 		goto done;
-	}
 		
 	/* Return output parameters */
-	result = werror_to_ntstatus(r.status);
+
+	result = r.status;
 
 done:
 	prs_mem_free(&qbuf);
@@ -939,20 +1001,19 @@ done:
 	return result;	
 }
 
+/*********************************************************************************
+ Win32 API - AddPrinter()
+ ********************************************************************************/
 /**********************************************************************
- * Install a printer 
+ * Install a printer
  */
-NTSTATUS cli_spoolss_addprinterex (
-	struct cli_state 	*cli, 
-	TALLOC_CTX		*mem_ctx,
-	uint32 			level,
-	PRINTER_INFO_CTR  	*ctr
-)
+WERROR cli_spoolss_addprinterex (struct cli_state *cli, TALLOC_CTX *mem_ctx,
+				 uint32 level, PRINTER_INFO_CTR*ctr)
 {
 	prs_struct 			qbuf, rbuf;
 	SPOOL_Q_ADDPRINTEREX 		q;
         SPOOL_R_ADDPRINTEREX 		r;
-	NTSTATUS 			result;
+	WERROR result = W_ERROR(ERRgeneral);
 	fstring 			server,
 					client,
 					user;
@@ -966,56 +1027,53 @@ NTSTATUS cli_spoolss_addprinterex (
         strupper (server);
 	fstrcpy  (user, cli->user_name);
 	
-
 	/* Initialise input parameters */
+
 	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
 	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 
+	/* Write the request */
 
-	/* write the request */
-	make_spoolss_q_addprinterex (mem_ctx, &q, server, client, user, level, ctr);
+	make_spoolss_q_addprinterex (mem_ctx, &q, server, client, user,
+				     level, ctr);
 
 	/* Marshall data and send request */
-	result = NT_STATUS_UNSUCCESSFUL;
+
 	if (!spoolss_io_q_addprinterex ("", &q, &qbuf, 0) ||
 	    !rpc_api_pipe_req (cli, SPOOLSS_ADDPRINTEREX, &qbuf, &rbuf)) 
-	{
 		goto done;
-	}
 
-		
 	/* Unmarshall response */
-	result = NT_STATUS_UNSUCCESSFUL;
+		
 	if (!spoolss_io_r_addprinterex ("", &r, &rbuf, 0))
-	{
 		goto done;
-	}
 		
 	/* Return output parameters */
-	result = werror_to_ntstatus(r.status);
 
-done:
+	result = r.status;
+
+ done:
 	prs_mem_free(&qbuf);
 	prs_mem_free(&rbuf);
 
 	return result;	
 }
 
+/*********************************************************************************
+ Win32 API - DeltePrinterDriver()
+ ********************************************************************************/
 /**********************************************************************
  * Delete a Printer Driver from the server (does not remove 
  * the driver files
  */
-NTSTATUS cli_spoolss_deleteprinterdriver (
-	struct cli_state 	*cli, 
-	TALLOC_CTX		*mem_ctx,
-	char			*arch,
-	char			*driver
-)
+WERROR cli_spoolss_deleteprinterdriver (struct cli_state *cli, 
+					TALLOC_CTX *mem_ctx, char *arch,
+					char *driver)
 {
 	prs_struct 			qbuf, rbuf;
 	SPOOL_Q_DELETEPRINTERDRIVER	q;
         SPOOL_R_DELETEPRINTERDRIVER	r;
-	NTSTATUS			result;
+	WERROR result = W_ERROR(ERRgeneral);
 	fstring				server;
 
 	ZERO_STRUCT(q);
@@ -1029,90 +1087,321 @@ NTSTATUS cli_spoolss_deleteprinterdriver (
         slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
         strupper (server);
 
-	/* write the request */
-	make_spoolss_q_deleteprinterdriver (mem_ctx, &q, server, arch, driver);
+	/* Write the request */
+
+	make_spoolss_q_deleteprinterdriver(mem_ctx, &q, server, arch, driver);
 
 	/* Marshall data and send request */
-	result = NT_STATUS_UNSUCCESSFUL;
+
 	if (!spoolss_io_q_deleteprinterdriver ("", &q, &qbuf, 0) ||
 	    !rpc_api_pipe_req (cli,SPOOLSS_DELETEPRINTERDRIVER , &qbuf, &rbuf)) 
-	{
 		goto done;
-	}
 
-		
 	/* Unmarshall response */
-	result = NT_STATUS_UNSUCCESSFUL;
+		
 	if (!spoolss_io_r_deleteprinterdriver ("", &r, &rbuf, 0))
-	{
 		goto done;
-	}
 		
 	/* Return output parameters */
-	result = werror_to_ntstatus(r.status);
 
-done:
+	result = r.status;
+
+ done:
 	prs_mem_free(&qbuf);
 	prs_mem_free(&rbuf);
 
 	return result;	
 }
 
-/* Get print processor directory */
+/*********************************************************************************
+ Win32 API - GetPrinterProcessorDirectory()
+ ********************************************************************************/
 
-NTSTATUS cli_spoolss_getprintprocessordirectory(struct cli_state *cli,
-						TALLOC_CTX *mem_ctx,
-						char *name,
-						char *environment,
-						fstring procdir)
+WERROR cli_spoolss_getprintprocessordirectory(struct cli_state *cli,
+					      TALLOC_CTX *mem_ctx,
+					      uint32 offered, uint32 *needed,
+					      char *name, char *environment,
+					      fstring procdir)
 {
 	prs_struct qbuf, rbuf;
 	SPOOL_Q_GETPRINTPROCESSORDIRECTORY q;
 	SPOOL_R_GETPRINTPROCESSORDIRECTORY r;
-	NTSTATUS result;
 	int level = 1;
+	WERROR result = W_ERROR(ERRgeneral);
 	NEW_BUFFER buffer;
-	uint32 needed = 100;
 
 	ZERO_STRUCT(q);
 	ZERO_STRUCT(r);
 
 	/* Initialise parse structures */
 
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 
 	/* Initialise input parameters */
 
-	do {
-		init_buffer(&buffer, needed, mem_ctx);
+	init_buffer(&buffer, offered, mem_ctx);
+
+	make_spoolss_q_getprintprocessordirectory(
+		&q, name, environment, level, &buffer, offered);
+
+	/* Marshall data and send request */
+
+	if (!spoolss_io_q_getprintprocessordirectory("", &q, &qbuf, 0) ||
+	    !rpc_api_pipe_req(cli, SPOOLSS_GETPRINTPROCESSORDIRECTORY,
+			      &qbuf, &rbuf))
+		goto done;
+		
+	/* Unmarshall response */
+		
+	if (!spoolss_io_r_getprintprocessordirectory("", &r, &rbuf, 0))
+		goto done;
+
+	/* Return output parameters */
+		
+	result = r.status;
+
+	if (needed)
+		*needed = r.needed;
+
+	if (W_ERROR_IS_OK(result))
+		fstrcpy(procdir, "Not implemented!");
+
+ done:
+	prs_mem_free(&qbuf);
+	prs_mem_free(&rbuf);
+
+	return result;
+}
+
+/** Add a form to a printer.
+ *
+ * @param cli              Pointer to client state structure which is open
+ *                         on the SPOOLSS pipe.
+ * @param mem_ctx          Pointer to an initialised talloc context.
+ *
+ * @param handle           Policy handle opened with cli_spoolss_open_printer_ex
+ *                         or cli_spoolss_addprinterex.
+ * @param level            Form info level to add - should always be 1.
+ * @param form             A pointer to the form to be added.
+ *
+ */
+
+WERROR cli_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+			   POLICY_HND *handle, uint32 level, FORM *form)
+{
+	prs_struct qbuf, rbuf;
+	SPOOL_Q_ADDFORM q;
+	SPOOL_R_ADDFORM r;
+	WERROR result = W_ERROR(ERRgeneral);
+
+	ZERO_STRUCT(q);
+	ZERO_STRUCT(r);
+
+	/* Initialise parse structures */
 
 		prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
 		prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 		
-		make_spoolss_q_getprintprocessordirectory(&q, name, 
-							  environment, level,
-							  &buffer, needed);
+	/* Initialise input parameters */
+
+        make_spoolss_q_addform(&q, handle, level, form);
 
 		/* Marshall data and send request */
 
-		if (!spoolss_io_q_getprintprocessordirectory("", &q, &qbuf, 0) ||
-		    !rpc_api_pipe_req(cli, SPOOLSS_GETPRINTPROCESSORDIRECTORY, &qbuf, &rbuf)) {
-			result = NT_STATUS_UNSUCCESSFUL;
+	if (!spoolss_io_q_addform("", &q, &qbuf, 0) ||
+	    !rpc_api_pipe_req(cli, SPOOLSS_ADDFORM, &qbuf, &rbuf))
+		goto done;
+
+	/* Unmarshall response */
+
+	if (!spoolss_io_r_addform("", &r, &rbuf, 0))
 			goto done;
-		}
+
+	/* Return output parameters */
+
+	result = r.status;
+
+ done:
+	prs_mem_free(&qbuf);
+	prs_mem_free(&rbuf);
+
+	return result;
+}
 		
+/** Set a form on a printer.
+ *
+ * @param cli              Pointer to client state structure which is open
+ *                         on the SPOOLSS pipe.
+ * @param mem_ctx          Pointer to an initialised talloc context.
+ *
+ * @param handle           Policy handle opened with cli_spoolss_open_printer_ex 
+ *                         or cli_spoolss_addprinterex.
+ * @param level            Form info level to set - should always be 1.
+ * @param form             A pointer to the form to be set.
+ *
+ */
+
+WERROR cli_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+			   POLICY_HND *handle, uint32 level, char *form_name,
+			   FORM *form)
+{
+	prs_struct qbuf, rbuf;
+	SPOOL_Q_SETFORM q;
+	SPOOL_R_SETFORM r;
+	WERROR result = W_ERROR(ERRgeneral);
+
+	ZERO_STRUCT(q);
+	ZERO_STRUCT(r);
+
+	/* Initialise parse structures */
+
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+
+	/* Initialise input parameters */
+
+        make_spoolss_q_setform(&q, handle, level, form_name, form);
+	
+	/* Marshall data and send request */
+
+	if (!spoolss_io_q_setform("", &q, &qbuf, 0) ||
+	    !rpc_api_pipe_req(cli, SPOOLSS_SETFORM, &qbuf, &rbuf))
+		goto done;
+
 		/* Unmarshall response */
 		
-		if (!spoolss_io_r_getprintprocessordirectory("", &r, &rbuf, 0)) {
-			result = NT_STATUS_UNSUCCESSFUL;
+	if (!spoolss_io_r_setform("", &r, &rbuf, 0))
 			goto done;
-		}
+
+	/* Return output parameters */
+
+	result = r.status;
+
+	if (!W_ERROR_IS_OK(result))
+		goto done;
+
+
+
+ done:
+	prs_mem_free(&qbuf);
+	prs_mem_free(&rbuf);
+
+	return result;
+}
+
+/** Get a form on a printer.
+ *
+ * @param cli              Pointer to client state structure which is open
+ *                         on the SPOOLSS pipe.
+ * @param mem_ctx          Pointer to an initialised talloc context.
+ *
+ * @param handle           Policy handle opened with cli_spoolss_open_printer_ex 
+ *                         or cli_spoolss_addprinterex.
+ * @param formname         Name of the form to get
+ * @param level            Form info level to get - should always be 1.
+ *
+ */
+
+WERROR cli_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+			   uint32 offered, uint32 *needed,
+			   POLICY_HND *handle, char *formname, uint32 level, 
+			   FORM_1 *form)
+{
+	prs_struct qbuf, rbuf;
+	SPOOL_Q_GETFORM q;
+	SPOOL_R_GETFORM r;
+	WERROR result = W_ERROR(ERRgeneral);
+	NEW_BUFFER buffer;
+
+	ZERO_STRUCT(q);
+	ZERO_STRUCT(r);
+
+	/* Initialise parse structures */
+
+	init_buffer(&buffer, offered, mem_ctx);
+
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+
+	/* Initialise input parameters */
+
+        make_spoolss_q_getform(&q, handle, formname, level, &buffer, offered);
+	
+	/* Marshall data and send request */
+
+	if (!spoolss_io_q_getform("", &q, &qbuf, 0) ||
+	    !rpc_api_pipe_req(cli, SPOOLSS_GETFORM, &qbuf, &rbuf))
+		goto done;
+
+	/* Unmarshall response */
+
+	if (!spoolss_io_r_getform("", &r, &rbuf, 0))
+		goto done;
 
 		/* Return output parameters */
 		
-		result = werror_to_ntstatus(r.status);
+	result = r.status;
+
+	if (needed)
+		*needed = r.needed;
+
+	if (W_ERROR_IS_OK(result)) 
+		smb_io_form_1("", r.buffer, form, 0);
+
+ done:
+	prs_mem_free(&qbuf);
+	prs_mem_free(&rbuf);
+
+	return result;
+}
+
+/** Delete a form on a printer.
+ *
+ * @param cli              Pointer to client state structure which is open
+ *                         on the SPOOLSS pipe.
+ * @param mem_ctx          Pointer to an initialised talloc context.
+ *
+ * @param handle           Policy handle opened with cli_spoolss_open_printer_ex 
+ *                         or cli_spoolss_addprinterex.
+ * @param form             The name of the form to delete.
+ *
+ */
+
+WERROR cli_spoolss_deleteform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+			      POLICY_HND *handle, char *form_name)
+{
+	prs_struct qbuf, rbuf;
+	SPOOL_Q_DELETEFORM q;
+	SPOOL_R_DELETEFORM r;
+	WERROR result = W_ERROR(ERRgeneral);
+
+	ZERO_STRUCT(q);
+	ZERO_STRUCT(r);
+
+	/* Initialise parse structures */
+
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 
-	} while (NT_STATUS_V(result) == 
-		 NT_STATUS_V(ERROR_INSUFFICIENT_BUFFER));
+	/* Initialise input parameters */
+
+        make_spoolss_q_deleteform(&q, handle, form_name);
+	
+	/* Marshall data and send request */
+
+	if (!spoolss_io_q_deleteform("", &q, &qbuf, 0) ||
+	    !rpc_api_pipe_req(cli, SPOOLSS_DELETEFORM, &qbuf, &rbuf))
+		goto done;
+
+	/* Unmarshall response */
+
+	if (!spoolss_io_r_deleteform("", &r, &rbuf, 0))
+		goto done;
+
+	/* Return output parameters */
+
+	result = r.status;
 
  done:
 	prs_mem_free(&qbuf);
@@ -1121,16 +1410,99 @@ NTSTATUS cli_spoolss_getprintprocessordirectory(struct cli_state *cli,
 	return result;
 }
 
+static void decode_forms_1(TALLOC_CTX *mem_ctx, NEW_BUFFER *buffer, 
+			   uint32 num_forms, FORM_1 **forms)
+{
+	int i;
+
+	*forms = (FORM_1 *)talloc(mem_ctx, num_forms * sizeof(FORM_1));
+	buffer->prs.data_offset = 0;
+
+	for (i = 0; i < num_forms; i++)
+		smb_io_form_1("", buffer, &((*forms)[i]), 0);
+}
+
+/** Enumerate forms
+ *
+ * @param cli              Pointer to client state structure which is open
+ *                         on the SPOOLSS pipe.
+ * @param mem_ctx          Pointer to an initialised talloc context.
+ *
+ * @param offered          Buffer size offered in the request.
+ * @param needed           Number of bytes needed to complete the request.
+ *                         may be NULL.
+ *                         or cli_spoolss_addprinterex.
+ * @param level            Form info level to get - should always be 1.
+ * @param handle           Open policy handle
+ *
+ */
 
-/*****************************************************************************/
+WERROR cli_spoolss_enumforms(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+			     uint32 offered, uint32 *needed,
+			     POLICY_HND *handle, int level, uint32 *num_forms,
+			     FORM_1 **forms)
+{
+	prs_struct qbuf, rbuf;
+	SPOOL_Q_ENUMFORMS q;
+	SPOOL_R_ENUMFORMS r;
+	WERROR result = W_ERROR(ERRgeneral);
+	NEW_BUFFER buffer;
 
-NTSTATUS cli_spoolss_setprinterdata (struct cli_state *cli, TALLOC_CTX *mem_ctx,
+	ZERO_STRUCT(q);
+	ZERO_STRUCT(r);
+
+	/* Initialise parse structures */
+
+	init_buffer(&buffer, offered, mem_ctx);
+
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+
+	/* Initialise input parameters */
+
+        make_spoolss_q_enumforms(&q, handle, level, &buffer, offered);
+
+	/* Marshall data and send request */
+
+	if (!spoolss_io_q_enumforms("", &q, &qbuf, 0) ||
+	    !rpc_api_pipe_req(cli, SPOOLSS_ENUMFORMS, &qbuf, &rbuf))
+		goto done;
+
+	/* Unmarshall response */
+
+	if (!spoolss_io_r_enumforms("", &r, &rbuf, 0))
+		goto done;
+
+	/* Return output parameters */
+
+	result = r.status;
+
+	if (needed)
+		*needed = r.needed;
+
+	if (num_forms)
+		*num_forms = r.numofforms;
+
+	decode_forms_1(mem_ctx, r.buffer, *num_forms, forms);
+
+ done:
+	prs_mem_free(&qbuf);
+	prs_mem_free(&rbuf);
+
+	return result;
+}
+
+/*********************************************************************************
+ Win32 API - SetPrinterData()
+ ********************************************************************************/
+
+WERROR cli_spoolss_setprinterdata (struct cli_state *cli, TALLOC_CTX *mem_ctx,
 					POLICY_HND *pol, char* valname, char* value)
 {
 	prs_struct qbuf, rbuf;
 	SPOOL_Q_SETPRINTERDATA q;
         SPOOL_R_SETPRINTERDATA r;
-	NTSTATUS result;
+	WERROR result = W_ERROR(ERRgeneral);
 
 	ZERO_STRUCT(q);
 	ZERO_STRUCT(r);
@@ -1147,15 +1519,13 @@ NTSTATUS cli_spoolss_setprinterdata (struct cli_state *cli, TALLOC_CTX *mem_ctx,
 	/* Marshall data and send request */
 	if (!spoolss_io_q_setprinterdata ("", &q, &qbuf, 0) ||
 	    !rpc_api_pipe_req (cli, SPOOLSS_SETPRINTERDATA, &qbuf, &rbuf)) 
-	{
-		result = NT_STATUS_UNSUCCESSFUL;
 		goto done;
-	}
 
 	/* Unmarshall response */
-	if (spoolss_io_r_setprinterdata ("", &r, &rbuf, 0)) {
-		result = werror_to_ntstatus(r.status);
-	}
+	if (spoolss_io_r_setprinterdata ("", &r, &rbuf, 0))
+		goto done;
+		
+	result = r.status;
 		
 done:
 	prs_mem_free(&qbuf);
@@ -1164,3 +1534,5 @@ done:
 	return result;	
 }
 
+
+/** @} **/