r7644: - remove some dublicate structures SetForm and AddForm uses the same struct

- fix some typos in EnumPrintServerForms()/GetPrintServerForms()
- add AddPrintServerForms()/SetPrintServerForms() and DeletePrintServerForms

metze
(This used to be commit 73906388421beebb34f2a00c9e0d1fc8b400a42a)

3 files changed, 241 insertions, 40 deletions

diff --git a/source4/librpc/idl/spoolss.idl b/source4/librpc/idl/spoolss.idl
index 33ae96caf5..87a909b22f 100644
--- a/source4/librpc/idl/spoolss.idl
+++ b/source4/librpc/idl/spoolss.idl
@@ -817,7 +817,19 @@
 
 	typedef struct {
 		spoolss_FormFlags flags;
-		[relative] unistr *form_name;
+		[relative] nstring *form_name;
+		spoolss_FormSize size;
+		spoolss_FormArea area;
+	} spoolss_FormInfo1;
+
+	typedef [nodiscriminant,relative_base,public,gensize] union {
+		[case(1)] spoolss_FormInfo1 info1;
+		[default];
+	} spoolss_FormInfo;
+
+	typedef struct {
+		spoolss_FormFlags flags;
+		unistr *form_name;
 		spoolss_FormSize size;
 		spoolss_FormArea area;
 	} spoolss_AddFormInfo1;
@@ -841,13 +853,6 @@
 
 	/******************/
 	/* Function: 0x20 */
-	typedef struct {
-		spoolss_FormFlags flags;
-		[relative] nstring *form_name;
-		spoolss_FormSize size;
-		spoolss_FormArea area;
-	} spoolss_FormInfo1;
-
 	WERROR spoolss_GetForm(
 		[in,ref] policy_handle *handle,
 		[in] unistr form_name,
@@ -858,31 +863,15 @@
 		[out] uint32 needed
 	);
 
-	typedef struct {
-		spoolss_FormFlags flags;
-		unistr *form_name;
-		spoolss_FormSize size;
-		spoolss_FormArea area;
-	} spoolss_SetFormInfo1;
-
-	typedef [switch_type(uint32)] union {
-		[case(1)] spoolss_SetFormInfo1 *info1;
-	} spoolss_SetFormInfo;
-
 	/******************/
 	/* Function: 0x21 */
 	WERROR spoolss_SetForm(
 		[in,ref] policy_handle *handle,
 		[in] unistr form_name,
 		[in] uint32 level,
-		[in,switch_is(level)] spoolss_SetFormInfo info
+		[in,switch_is(level)] spoolss_AddFormInfo info
 	);
 
-	typedef [nodiscriminant,relative_base,public,gensize] union {
-		[case(1)] spoolss_FormInfo1 info1;
-		[default];
-	} spoolss_FormInfo;
-
 	/******************/
 	/* Function: 0x22 */
 	[public,noopnum,noprint] WERROR _spoolss_EnumForms(
diff --git a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
index 4c8113365e..2788489dfe 100644
--- a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
+++ b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
@@ -67,6 +67,19 @@ static int sptr_db_search(struct ldb_context *ldb,
 	return count;
 }
 
+#define SET_STRING(ldb, mod, attr, value) do { \
+	if (value == NULL) return WERR_INVALID_PARAM; \
+	if (samdb_msg_add_string(ldb, (TALLOC_CTX *)mod, mod, attr, value) != 0) { \
+		return WERR_NOMEM; \
+	} \
+} while (0)
+
+#define SET_UINT(ldb, mod, attr, value) do { \
+	if (samdb_msg_add_uint(ldb, (TALLOC_CTX *)mod, mod, attr, value) != 0) { \
+		return WERR_NOMEM; \
+	} \
+} while (0)
+
 static NTSTATUS sptr_init_context(struct ntptr_context *ntptr)
 {
 	struct ldb_context *sptr_db = sptr_db_connect(ntptr);
@@ -160,7 +173,7 @@ static WERROR sptr_EnumPrintServerForms(struct ntptr_GenericHandle *server, TALL
 	int i;
 	union spoolss_FormInfo *info;
 
-	count = sptr_db_search(sptr_db, mem_ctx, "CN=PrintServer", &msgs, NULL,
+	count = sptr_db_search(sptr_db, mem_ctx, "CN=Forms,CN=PrintServer", &msgs, NULL,
 			       "(&(objectclass=form))");
 
 	if (count == 0) return WERR_OK;
@@ -177,12 +190,12 @@ static WERROR sptr_EnumPrintServerForms(struct ntptr_GenericHandle *server, TALL
 			info[i].info1.form_name		= samdb_result_string(msgs[i], "form_name", "Letter");
 			W_ERROR_HAVE_NO_MEMORY(info[i].info1.form_name);
 
-			info[i].info1.size.width	= samdb_result_uint(msgs[i], "size_widgth", 0x34b5c);
+			info[i].info1.size.width	= samdb_result_uint(msgs[i], "size_width", 0x34b5c);
 			info[i].info1.size.height	= samdb_result_uint(msgs[i], "size_height", 0x44368);
 
 			info[i].info1.area.left		= samdb_result_uint(msgs[i], "area_left", 0);
 			info[i].info1.area.top		= samdb_result_uint(msgs[i], "area_top", 0);
-			info[i].info1.area.right	= samdb_result_uint(msgs[i], "are_right", 0x34b5c);
+			info[i].info1.area.right	= samdb_result_uint(msgs[i], "area_right", 0x34b5c);
 			info[i].info1.area.bottom	= samdb_result_uint(msgs[i], "area_bottom", 0x44368);
 		}
 		break;
@@ -195,16 +208,71 @@ static WERROR sptr_EnumPrintServerForms(struct ntptr_GenericHandle *server, TALL
 	return WERR_OK;
 }
 
+static WERROR sptr_AddPrintServerForm(struct ntptr_GenericHandle *server, TALLOC_CTX *mem_ctx,
+				      struct spoolss_AddForm *r)
+{
+	struct ldb_context *sptr_db = talloc_get_type(server->ntptr->private_data, struct ldb_context);
+	struct ldb_message *msg,**msgs;
+	const char * const attrs[] = {"dn", NULL };
+	int count, ret;
+
+	/* TODO; do access checks here */
+
+	switch (r->in.level) {
+	case 1:
+		if (!r->in.info.info1) {
+			return WERR_FOOBAR;
+		}
+		count = sptr_db_search(sptr_db, mem_ctx, "CN=Forms,CN=PrintServer", &msgs, attrs,
+				       "(&(form_name=%s)(objectClass=form))",
+				       r->in.info.info1->form_name);
+
+		if (count == 1) return WERR_FOOBAR;
+		if (count > 1) return WERR_FOOBAR;
+		if (count < 0) return WERR_GENERAL_FAILURE;
+
+		msg = ldb_msg_new(mem_ctx);
+		W_ERROR_HAVE_NO_MEMORY(msg);
+
+		/* add core elements to the ldb_message for the Form */
+		msg->dn = talloc_asprintf(msg, "form_name=%s,CN=Forms,CN=PrintServer",
+						r->in.info.info1->form_name);
+		SET_STRING(sptr_db, msg, "objectClass", "form");
+
+		SET_UINT(sptr_db, msg, "flags", r->in.info.info1->flags);
+
+		SET_STRING(sptr_db, msg, "form_name", r->in.info.info1->form_name);
+
+		SET_UINT(sptr_db, msg, "size_width", r->in.info.info1->size.width);
+		SET_UINT(sptr_db, msg, "size_height", r->in.info.info1->size.height);
+
+		SET_UINT(sptr_db, msg, "area_left", r->in.info.info1->area.left);
+		SET_UINT(sptr_db, msg, "area_top", r->in.info.info1->area.top);
+		SET_UINT(sptr_db, msg, "area_right", r->in.info.info1->area.right);
+		SET_UINT(sptr_db, msg, "area_bottom", r->in.info.info1->area.bottom);
+		break;
+	default:
+		return WERR_UNKNOWN_LEVEL;
+	}
+
+	ret = samdb_add(sptr_db, mem_ctx, msg);
+	if (ret != 0) {
+		return WERR_FOOBAR;
+	}
+
+	return WERR_OK;
+}
+
 static WERROR sptr_GetPrintServerForm(struct ntptr_GenericHandle *server, TALLOC_CTX *mem_ctx,
-					struct spoolss_GetForm *r)
+				      struct spoolss_GetForm *r)
 {
 	struct ldb_context *sptr_db = talloc_get_type(server->ntptr->private_data, struct ldb_context);
 	struct ldb_message **msgs;
 	int count;
 	union spoolss_FormInfo *info;
 
-	count = sptr_db_search(sptr_db, mem_ctx, "CN=PrintServer", &msgs, NULL,
-			       "(&(form_name=%s)(objectclass=form))",
+	count = sptr_db_search(sptr_db, mem_ctx, "CN=Forms,CN=PrintServer", &msgs, NULL,
+			       "(&(form_name=%s)(objectClass=form))",
 			       r->in.form_name);
 
 	if (count == 0) return WERR_FOOBAR;
@@ -221,12 +289,12 @@ static WERROR sptr_GetPrintServerForm(struct ntptr_GenericHandle *server, TALLOC
 		info->info1.form_name	= samdb_result_string(msgs[0], "form_name", "Letter");
 		W_ERROR_HAVE_NO_MEMORY(info->info1.form_name);
 
-		info->info1.size.width	= samdb_result_uint(msgs[0], "size_widgth", 0x34b5c);
+		info->info1.size.width	= samdb_result_uint(msgs[0], "size_width", 0x34b5c);
 		info->info1.size.height	= samdb_result_uint(msgs[0], "size_height", 0x44368);
 
 		info->info1.area.left	= samdb_result_uint(msgs[0], "area_left", 0);
 		info->info1.area.top	= samdb_result_uint(msgs[0], "area_top", 0);
-		info->info1.area.right	= samdb_result_uint(msgs[0], "are_right", 0x34b5c);
+		info->info1.area.right	= samdb_result_uint(msgs[0], "area_right", 0x34b5c);
 		info->info1.area.bottom	= samdb_result_uint(msgs[0], "area_bottom", 0x44368);
 		break;
 	default:
@@ -237,6 +305,90 @@ static WERROR sptr_GetPrintServerForm(struct ntptr_GenericHandle *server, TALLOC
 	return WERR_OK;
 }
 
+static WERROR sptr_SetPrintServerForm(struct ntptr_GenericHandle *server, TALLOC_CTX *mem_ctx,
+				      struct spoolss_SetForm *r)
+{
+	struct ldb_context *sptr_db = talloc_get_type(server->ntptr->private_data, struct ldb_context);
+	struct ldb_message *msg,**msgs;
+	const char * const attrs[] = { "ntSecurityDescriptor", NULL};
+	int count, ret;
+
+	/* TODO: do checks access here */
+
+	switch (r->in.level) {
+	case 1:
+		if (!r->in.info.info1) {
+			return WERR_FOOBAR;
+		}
+
+		count = sptr_db_search(sptr_db, mem_ctx, "CN=Forms,CN=PrintServer", &msgs, attrs,
+				       "(&(form_name=%s)(objectClass=form))",
+				       r->in.info.info1->form_name);
+
+		if (count == 0) return WERR_FOOBAR;
+		if (count > 1) return WERR_FOOBAR;
+		if (count < 0) return WERR_GENERAL_FAILURE;
+
+		msg = ldb_msg_new(mem_ctx);
+		W_ERROR_HAVE_NO_MEMORY(msg);
+
+		/* add core elements to the ldb_message for the user */
+		msg->dn = msgs[0]->dn;
+
+		SET_UINT(sptr_db, msg, "flags", r->in.info.info1->flags);
+
+		SET_STRING(sptr_db, msg, "form_name", r->in.info.info1->form_name);
+
+		SET_UINT(sptr_db, msg, "size_width", r->in.info.info1->size.width);
+		SET_UINT(sptr_db, msg, "size_height", r->in.info.info1->size.height);
+
+		SET_UINT(sptr_db, msg, "area_left", r->in.info.info1->area.left);
+		SET_UINT(sptr_db, msg, "area_top", r->in.info.info1->area.top);
+		SET_UINT(sptr_db, msg, "area_right", r->in.info.info1->area.right);
+		SET_UINT(sptr_db, msg, "area_bottom", r->in.info.info1->area.bottom);
+		break;
+	default:
+		return WERR_UNKNOWN_LEVEL;
+	}
+
+	ret = samdb_replace(sptr_db, mem_ctx, msg);
+	if (ret != 0) {
+		return WERR_FOOBAR;
+	}
+
+	return WERR_OK;
+}
+
+static WERROR sptr_DeletePrintServerForm(struct ntptr_GenericHandle *server, TALLOC_CTX *mem_ctx,
+					 struct spoolss_DeleteForm *r)
+{
+	struct ldb_context *sptr_db = talloc_get_type(server->ntptr->private_data, struct ldb_context);
+	struct ldb_message **msgs;
+	const char * const attrs[] = { "ntSecurityDescriptor", NULL};
+	int count, ret;
+
+	/* TODO: do checks access here */
+
+	if (!r->in.form_name) {
+		return WERR_FOOBAR;
+	}
+
+	count = sptr_db_search(sptr_db, mem_ctx, "CN=Forms,CN=PrintServer", &msgs, attrs,
+			       "(&(form_name=%s)(objectclass=form))",
+			       r->in.form_name);
+
+	if (count == 0) return WERR_FOOBAR;
+	if (count > 1) return WERR_FOOBAR;
+	if (count < 0) return WERR_GENERAL_FAILURE;
+
+	ret = samdb_delete(sptr_db, mem_ctx, msgs[0]->dn);
+	if (ret != 0) {
+		return WERR_FOOBAR;
+	}
+
+	return WERR_OK;
+}
+
 /* PrintServer Driver functions */
 static WERROR sptr_EnumPrinterDrivers(struct ntptr_context *ntptr, TALLOC_CTX *mem_ctx,
 				      struct spoolss_EnumPrinterDrivers *r)
@@ -520,11 +672,11 @@ static const struct ntptr_ops ntptr_simple_ldb_ops = {
 */
 	/* PrintServer Form functions */
 	.EnumPrintServerForms		= sptr_EnumPrintServerForms,
-/*	.AddPrintServerForm		= sptr_AddPrintServerForm,
-*/	.GetPrintServerForm		= sptr_GetPrintServerForm,
-/*	.SetPrintServerForm		= sptr_SetPrintServerForm,
+	.AddPrintServerForm		= sptr_AddPrintServerForm,
+	.GetPrintServerForm		= sptr_GetPrintServerForm,
+	.SetPrintServerForm		= sptr_SetPrintServerForm,
 	.DeletePrintServerForm		= sptr_DeletePrintServerForm,
-*/
+
 	/* PrintServer Driver functions */
 	.EnumPrinterDrivers		= sptr_EnumPrinterDrivers,
 /*	.AddPrinterDriver		= sptr_AddPrinterDriver,
diff --git a/source4/rpc_server/spoolss/dcesrv_spoolss.c b/source4/rpc_server/spoolss/dcesrv_spoolss.c
index 7689f084a9..f8a0ab5efa 100644
--- a/source4/rpc_server/spoolss/dcesrv_spoolss.c
+++ b/source4/rpc_server/spoolss/dcesrv_spoolss.c
@@ -581,7 +581,27 @@ static WERROR spoolss_ClosePrinter(struct dcesrv_call_state *dce_call, TALLOC_CT
 static WERROR spoolss_AddForm(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct spoolss_AddForm *r)
 {
-	DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+	struct ntptr_GenericHandle *handle;
+	struct dcesrv_handle *h;
+	WERROR status;
+
+	DCESRV_PULL_HANDLE_WERR(h, r->in.handle, DCESRV_HANDLE_ANY);
+	handle = talloc_get_type(h->data, struct ntptr_GenericHandle);
+
+	switch (handle->type) {
+		case NTPTR_HANDLE_SERVER:
+			status = ntptr_AddPrintServerForm(handle, mem_ctx, r);
+			W_ERROR_NOT_OK_RETURN(status);
+			break;
+		case NTPTR_HANDLE_PRINTER:
+			status = ntptr_AddPrinterForm(handle, mem_ctx, r);
+			W_ERROR_NOT_OK_RETURN(status);
+			break;
+		default:
+			return WERR_FOOBAR;
+	}
+
+	return WERR_OK;
 }
 
 
@@ -591,7 +611,27 @@ static WERROR spoolss_AddForm(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
 static WERROR spoolss_DeleteForm(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct spoolss_DeleteForm *r)
 {
-	DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+	struct ntptr_GenericHandle *handle;
+	struct dcesrv_handle *h;
+	WERROR status;
+
+	DCESRV_PULL_HANDLE_WERR(h, r->in.handle, DCESRV_HANDLE_ANY);
+	handle = talloc_get_type(h->data, struct ntptr_GenericHandle);
+
+	switch (handle->type) {
+		case NTPTR_HANDLE_SERVER:
+			status = ntptr_DeletePrintServerForm(handle, mem_ctx, r);
+			W_ERROR_NOT_OK_RETURN(status);
+			break;
+		case NTPTR_HANDLE_PRINTER:
+			status = ntptr_DeletePrinterForm(handle, mem_ctx, r);
+			W_ERROR_NOT_OK_RETURN(status);
+			break;
+		default:
+			return WERR_FOOBAR;
+	}
+
+	return WERR_OK;
 }
 
 
@@ -633,7 +673,27 @@ static WERROR spoolss_GetForm(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
 static WERROR spoolss_SetForm(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct spoolss_SetForm *r)
 {
-	DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+	struct ntptr_GenericHandle *handle;
+	struct dcesrv_handle *h;
+	WERROR status;
+
+	DCESRV_PULL_HANDLE_WERR(h, r->in.handle, DCESRV_HANDLE_ANY);
+	handle = talloc_get_type(h->data, struct ntptr_GenericHandle);
+
+	switch (handle->type) {
+		case NTPTR_HANDLE_SERVER:
+			status = ntptr_SetPrintServerForm(handle, mem_ctx, r);
+			W_ERROR_NOT_OK_RETURN(status);
+			break;
+		case NTPTR_HANDLE_PRINTER:
+			status = ntptr_SetPrinterForm(handle, mem_ctx, r);
+			W_ERROR_NOT_OK_RETURN(status);
+			break;
+		default:
+			return WERR_FOOBAR;
+	}
+
+	return WERR_OK;
 }