s3: re-run make samba3-idl.

Guenther

5 files changed, 125 insertions, 125 deletions

diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 318e4e35ea..709aebaea7 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -3057,9 +3057,9 @@ NTSTATUS rpccli_spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct rpc_pipe_cli
 							     struct policy_handle *handle /* [in] [ref] */,
 							     uint32_t flags /* [in]  */,
 							     uint32_t options /* [in]  */,
-							     const char *str /* [in] [unique,charset(UTF16)] */,
+							     const char *local_machine /* [in] [unique,charset(UTF16)] */,
 							     uint32_t printer_local /* [in]  */,
-							     struct spoolss_NotifyOptionsContainer *t1 /* [in] [unique] */,
+							     struct spoolss_NotifyOption *notify_options /* [in] [unique] */,
 							     WERROR *werror)
 {
 	struct spoolss_RemoteFindFirstPrinterChangeNotifyEx r;
@@ -3069,9 +3069,9 @@ NTSTATUS rpccli_spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct rpc_pipe_cli
 	r.in.handle = handle;
 	r.in.flags = flags;
 	r.in.options = options;
-	r.in.str = str;
+	r.in.local_machine = local_machine;
 	r.in.printer_local = printer_local;
-	r.in.t1 = t1;
+	r.in.notify_options = notify_options;
 
 	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(spoolss_RemoteFindFirstPrinterChangeNotifyEx, &r);
@@ -3162,7 +3162,7 @@ NTSTATUS rpccli_spoolss_RouterRefreshPrinterChangeNotify(struct rpc_pipe_client
 							 TALLOC_CTX *mem_ctx,
 							 struct policy_handle *handle /* [in] [ref] */,
 							 uint32_t change_low /* [in]  */,
-							 struct spoolss_NotifyOptionsContainer *container /* [in] [unique] */,
+							 struct spoolss_NotifyOption *options /* [in] [unique] */,
 							 struct spoolss_NotifyInfo **info /* [out] [ref] */,
 							 WERROR *werror)
 {
@@ -3172,7 +3172,7 @@ NTSTATUS rpccli_spoolss_RouterRefreshPrinterChangeNotify(struct rpc_pipe_client
 	/* In parameters */
 	r.in.handle = handle;
 	r.in.change_low = change_low;
-	r.in.container = container;
+	r.in.options = options;
 
 	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(spoolss_RouterRefreshPrinterChangeNotify, &r);
diff --git a/librpc/gen_ndr/cli_spoolss.h b/librpc/gen_ndr/cli_spoolss.h
index 0859d8d017..8e0c725cb3 100644
--- a/librpc/gen_ndr/cli_spoolss.h
+++ b/librpc/gen_ndr/cli_spoolss.h
@@ -377,9 +377,9 @@ NTSTATUS rpccli_spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct rpc_pipe_cli
 							     struct policy_handle *handle /* [in] [ref] */,
 							     uint32_t flags /* [in]  */,
 							     uint32_t options /* [in]  */,
-							     const char *str /* [in] [unique,charset(UTF16)] */,
+							     const char *local_machine /* [in] [unique,charset(UTF16)] */,
 							     uint32_t printer_local /* [in]  */,
-							     struct spoolss_NotifyOptionsContainer *t1 /* [in] [unique] */,
+							     struct spoolss_NotifyOption *notify_options /* [in] [unique] */,
 							     WERROR *werror);
 NTSTATUS rpccli_spoolss_RouterReplyPrinterEx(struct rpc_pipe_client *cli,
 					     TALLOC_CTX *mem_ctx,
@@ -394,7 +394,7 @@ NTSTATUS rpccli_spoolss_RouterRefreshPrinterChangeNotify(struct rpc_pipe_client
 							 TALLOC_CTX *mem_ctx,
 							 struct policy_handle *handle /* [in] [ref] */,
 							 uint32_t change_low /* [in]  */,
-							 struct spoolss_NotifyOptionsContainer *container /* [in] [unique] */,
+							 struct spoolss_NotifyOption *options /* [in] [unique] */,
 							 struct spoolss_NotifyInfo **info /* [out] [ref] */,
 							 WERROR *werror);
 NTSTATUS rpccli_spoolss_44(struct rpc_pipe_client *cli,
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index 1e4b5aa457..5446277fd1 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -11258,7 +11258,7 @@ _PUBLIC_ void ndr_print_spoolss_NotifyType(struct ndr_print *ndr, const char *na
 	ndr_print_enum(ndr, name, "ENUM", val, r);
 }
 
-static enum ndr_err_code ndr_push_spoolss_NotifyOptionsArray(struct ndr_push *ndr, int ndr_flags, const struct spoolss_NotifyOptionsArray *r)
+static enum ndr_err_code ndr_push_spoolss_NotifyOptionType(struct ndr_push *ndr, int ndr_flags, const struct spoolss_NotifyOptionType *r)
 {
 	uint32_t cntr_fields_1;
 	if (ndr_flags & NDR_SCALARS) {
@@ -11281,7 +11281,7 @@ static enum ndr_err_code ndr_push_spoolss_NotifyOptionsArray(struct ndr_push *nd
 	return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_spoolss_NotifyOptionsArray(struct ndr_pull *ndr, int ndr_flags, struct spoolss_NotifyOptionsArray *r)
+static enum ndr_err_code ndr_pull_spoolss_NotifyOptionType(struct ndr_pull *ndr, int ndr_flags, struct spoolss_NotifyOptionType *r)
 {
 	uint32_t _ptr_fields;
 	uint32_t cntr_fields_1;
@@ -11322,10 +11322,10 @@ static enum ndr_err_code ndr_pull_spoolss_NotifyOptionsArray(struct ndr_pull *nd
 	return NDR_ERR_SUCCESS;
 }
 
-_PUBLIC_ void ndr_print_spoolss_NotifyOptionsArray(struct ndr_print *ndr, const char *name, const struct spoolss_NotifyOptionsArray *r)
+_PUBLIC_ void ndr_print_spoolss_NotifyOptionType(struct ndr_print *ndr, const char *name, const struct spoolss_NotifyOptionType *r)
 {
 	uint32_t cntr_fields_1;
-	ndr_print_struct(ndr, name, "spoolss_NotifyOptionsArray");
+	ndr_print_struct(ndr, name, "spoolss_NotifyOptionType");
 	ndr->depth++;
 	ndr_print_spoolss_NotifyType(ndr, "type", r->type);
 	ndr_print_uint16(ndr, "u1", r->u1);
@@ -11350,89 +11350,89 @@ _PUBLIC_ void ndr_print_spoolss_NotifyOptionsArray(struct ndr_print *ndr, const
 	ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_spoolss_NotifyOptionsContainer(struct ndr_push *ndr, int ndr_flags, const struct spoolss_NotifyOptionsContainer *r)
+static enum ndr_err_code ndr_push_spoolss_NotifyOption(struct ndr_push *ndr, int ndr_flags, const struct spoolss_NotifyOption *r)
 {
-	uint32_t cntr_options_1;
+	uint32_t cntr_types_1;
 	if (ndr_flags & NDR_SCALARS) {
 		NDR_CHECK(ndr_push_align(ndr, 4));
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 2));
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->flags));
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
-		NDR_CHECK(ndr_push_unique_ptr(ndr, r->options));
+		NDR_CHECK(ndr_push_unique_ptr(ndr, r->types));
 	}
 	if (ndr_flags & NDR_BUFFERS) {
-		if (r->options) {
+		if (r->types) {
 			NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
-			for (cntr_options_1 = 0; cntr_options_1 < r->count; cntr_options_1++) {
-				NDR_CHECK(ndr_push_spoolss_NotifyOptionsArray(ndr, NDR_SCALARS, &r->options[cntr_options_1]));
+			for (cntr_types_1 = 0; cntr_types_1 < r->count; cntr_types_1++) {
+				NDR_CHECK(ndr_push_spoolss_NotifyOptionType(ndr, NDR_SCALARS, &r->types[cntr_types_1]));
 			}
-			for (cntr_options_1 = 0; cntr_options_1 < r->count; cntr_options_1++) {
-				NDR_CHECK(ndr_push_spoolss_NotifyOptionsArray(ndr, NDR_BUFFERS, &r->options[cntr_options_1]));
+			for (cntr_types_1 = 0; cntr_types_1 < r->count; cntr_types_1++) {
+				NDR_CHECK(ndr_push_spoolss_NotifyOptionType(ndr, NDR_BUFFERS, &r->types[cntr_types_1]));
 			}
 		}
 	}
 	return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_spoolss_NotifyOptionsContainer(struct ndr_pull *ndr, int ndr_flags, struct spoolss_NotifyOptionsContainer *r)
+static enum ndr_err_code ndr_pull_spoolss_NotifyOption(struct ndr_pull *ndr, int ndr_flags, struct spoolss_NotifyOption *r)
 {
-	uint32_t _ptr_options;
-	uint32_t cntr_options_1;
-	TALLOC_CTX *_mem_save_options_0;
-	TALLOC_CTX *_mem_save_options_1;
+	uint32_t _ptr_types;
+	uint32_t cntr_types_1;
+	TALLOC_CTX *_mem_save_types_0;
+	TALLOC_CTX *_mem_save_types_1;
 	if (ndr_flags & NDR_SCALARS) {
 		NDR_CHECK(ndr_pull_align(ndr, 4));
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->version));
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->flags));
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
-		NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_options));
-		if (_ptr_options) {
-			NDR_PULL_ALLOC(ndr, r->options);
+		NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_types));
+		if (_ptr_types) {
+			NDR_PULL_ALLOC(ndr, r->types);
 		} else {
-			r->options = NULL;
+			r->types = NULL;
 		}
 	}
 	if (ndr_flags & NDR_BUFFERS) {
-		if (r->options) {
-			_mem_save_options_0 = NDR_PULL_GET_MEM_CTX(ndr);
-			NDR_PULL_SET_MEM_CTX(ndr, r->options, 0);
-			NDR_CHECK(ndr_pull_array_size(ndr, &r->options));
-			NDR_PULL_ALLOC_N(ndr, r->options, ndr_get_array_size(ndr, &r->options));
-			_mem_save_options_1 = NDR_PULL_GET_MEM_CTX(ndr);
-			NDR_PULL_SET_MEM_CTX(ndr, r->options, 0);
-			for (cntr_options_1 = 0; cntr_options_1 < r->count; cntr_options_1++) {
-				NDR_CHECK(ndr_pull_spoolss_NotifyOptionsArray(ndr, NDR_SCALARS, &r->options[cntr_options_1]));
-			}
-			for (cntr_options_1 = 0; cntr_options_1 < r->count; cntr_options_1++) {
-				NDR_CHECK(ndr_pull_spoolss_NotifyOptionsArray(ndr, NDR_BUFFERS, &r->options[cntr_options_1]));
-			}
-			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_options_1, 0);
-			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_options_0, 0);
+		if (r->types) {
+			_mem_save_types_0 = NDR_PULL_GET_MEM_CTX(ndr);
+			NDR_PULL_SET_MEM_CTX(ndr, r->types, 0);
+			NDR_CHECK(ndr_pull_array_size(ndr, &r->types));
+			NDR_PULL_ALLOC_N(ndr, r->types, ndr_get_array_size(ndr, &r->types));
+			_mem_save_types_1 = NDR_PULL_GET_MEM_CTX(ndr);
+			NDR_PULL_SET_MEM_CTX(ndr, r->types, 0);
+			for (cntr_types_1 = 0; cntr_types_1 < r->count; cntr_types_1++) {
+				NDR_CHECK(ndr_pull_spoolss_NotifyOptionType(ndr, NDR_SCALARS, &r->types[cntr_types_1]));
+			}
+			for (cntr_types_1 = 0; cntr_types_1 < r->count; cntr_types_1++) {
+				NDR_CHECK(ndr_pull_spoolss_NotifyOptionType(ndr, NDR_BUFFERS, &r->types[cntr_types_1]));
+			}
+			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_types_1, 0);
+			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_types_0, 0);
 		}
-		if (r->options) {
-			NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->options, r->count));
+		if (r->types) {
+			NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->types, r->count));
 		}
 	}
 	return NDR_ERR_SUCCESS;
 }
 
-_PUBLIC_ void ndr_print_spoolss_NotifyOptionsContainer(struct ndr_print *ndr, const char *name, const struct spoolss_NotifyOptionsContainer *r)
+_PUBLIC_ void ndr_print_spoolss_NotifyOption(struct ndr_print *ndr, const char *name, const struct spoolss_NotifyOption *r)
 {
-	uint32_t cntr_options_1;
-	ndr_print_struct(ndr, name, "spoolss_NotifyOptionsContainer");
+	uint32_t cntr_types_1;
+	ndr_print_struct(ndr, name, "spoolss_NotifyOption");
 	ndr->depth++;
 	ndr_print_uint32(ndr, "version", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?2:r->version);
 	ndr_print_uint32(ndr, "flags", r->flags);
 	ndr_print_uint32(ndr, "count", r->count);
-	ndr_print_ptr(ndr, "options", r->options);
+	ndr_print_ptr(ndr, "types", r->types);
 	ndr->depth++;
-	if (r->options) {
-		ndr->print(ndr, "%s: ARRAY(%d)", "options", (int)r->count);
+	if (r->types) {
+		ndr->print(ndr, "%s: ARRAY(%d)", "types", (int)r->count);
 		ndr->depth++;
-		for (cntr_options_1=0;cntr_options_1<r->count;cntr_options_1++) {
+		for (cntr_types_1=0;cntr_types_1<r->count;cntr_types_1++) {
 			char *idx_1=NULL;
-			if (asprintf(&idx_1, "[%d]", cntr_options_1) != -1) {
-				ndr_print_spoolss_NotifyOptionsArray(ndr, "options", &r->options[cntr_options_1]);
+			if (asprintf(&idx_1, "[%d]", cntr_types_1) != -1) {
+				ndr_print_spoolss_NotifyOptionType(ndr, "types", &r->types[cntr_types_1]);
 				free(idx_1);
 			}
 		}
@@ -18201,19 +18201,19 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_RemoteFindFirstPrinterChangeNotifyEx
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
 		NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.handle));
-		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.flags));
+		NDR_CHECK(ndr_push_spoolss_PrinterChangeFlags(ndr, NDR_SCALARS, r->in.flags));
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.options));
-		NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.str));
-		if (r->in.str) {
-			NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.str, CH_UTF16)));
+		NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.local_machine));
+		if (r->in.local_machine) {
+			NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.local_machine, CH_UTF16)));
 			NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-			NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.str, CH_UTF16)));
-			NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.str, ndr_charset_length(r->in.str, CH_UTF16), sizeof(uint16_t), CH_UTF16));
+			NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.local_machine, CH_UTF16)));
+			NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.local_machine, ndr_charset_length(r->in.local_machine, CH_UTF16), sizeof(uint16_t), CH_UTF16));
 		}
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.printer_local));
-		NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.t1));
-		if (r->in.t1) {
-			NDR_CHECK(ndr_push_spoolss_NotifyOptionsContainer(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.t1));
+		NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.notify_options));
+		if (r->in.notify_options) {
+			NDR_CHECK(ndr_push_spoolss_NotifyOption(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.notify_options));
 		}
 	}
 	if (flags & NDR_OUT) {
@@ -18224,11 +18224,11 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_RemoteFindFirstPrinterChangeNotifyEx
 
 _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct ndr_pull *ndr, int flags, struct spoolss_RemoteFindFirstPrinterChangeNotifyEx *r)
 {
-	uint32_t _ptr_str;
-	uint32_t _ptr_t1;
+	uint32_t _ptr_local_machine;
+	uint32_t _ptr_notify_options;
 	TALLOC_CTX *_mem_save_handle_0;
-	TALLOC_CTX *_mem_save_str_0;
-	TALLOC_CTX *_mem_save_t1_0;
+	TALLOC_CTX *_mem_save_local_machine_0;
+	TALLOC_CTX *_mem_save_notify_options_0;
 	if (flags & NDR_IN) {
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->in.handle);
@@ -18237,38 +18237,38 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_RemoteFindFirstPrinterChangeNotifyEx
 		NDR_PULL_SET_MEM_CTX(ndr, r->in.handle, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.handle));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.flags));
+		NDR_CHECK(ndr_pull_spoolss_PrinterChangeFlags(ndr, NDR_SCALARS, &r->in.flags));
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.options));
-		NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_str));
-		if (_ptr_str) {
-			NDR_PULL_ALLOC(ndr, r->in.str);
+		NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_local_machine));
+		if (_ptr_local_machine) {
+			NDR_PULL_ALLOC(ndr, r->in.local_machine);
 		} else {
-			r->in.str = NULL;
+			r->in.local_machine = NULL;
 		}
-		if (r->in.str) {
-			_mem_save_str_0 = NDR_PULL_GET_MEM_CTX(ndr);
-			NDR_PULL_SET_MEM_CTX(ndr, r->in.str, 0);
-			NDR_CHECK(ndr_pull_array_size(ndr, &r->in.str));
-			NDR_CHECK(ndr_pull_array_length(ndr, &r->in.str));
-			if (ndr_get_array_length(ndr, &r->in.str) > ndr_get_array_size(ndr, &r->in.str)) {
-				return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->in.str), ndr_get_array_length(ndr, &r->in.str));
+		if (r->in.local_machine) {
+			_mem_save_local_machine_0 = NDR_PULL_GET_MEM_CTX(ndr);
+			NDR_PULL_SET_MEM_CTX(ndr, r->in.local_machine, 0);
+			NDR_CHECK(ndr_pull_array_size(ndr, &r->in.local_machine));
+			NDR_CHECK(ndr_pull_array_length(ndr, &r->in.local_machine));
+			if (ndr_get_array_length(ndr, &r->in.local_machine) > ndr_get_array_size(ndr, &r->in.local_machine)) {
+				return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->in.local_machine), ndr_get_array_length(ndr, &r->in.local_machine));
 			}
-			NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.str), sizeof(uint16_t)));
-			NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.str, ndr_get_array_length(ndr, &r->in.str), sizeof(uint16_t), CH_UTF16));
-			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_str_0, 0);
+			NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.local_machine), sizeof(uint16_t)));
+			NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.local_machine, ndr_get_array_length(ndr, &r->in.local_machine), sizeof(uint16_t), CH_UTF16));
+			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_local_machine_0, 0);
 		}
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.printer_local));
-		NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_t1));
-		if (_ptr_t1) {
-			NDR_PULL_ALLOC(ndr, r->in.t1);
+		NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_notify_options));
+		if (_ptr_notify_options) {
+			NDR_PULL_ALLOC(ndr, r->in.notify_options);
 		} else {
-			r->in.t1 = NULL;
+			r->in.notify_options = NULL;
 		}
-		if (r->in.t1) {
-			_mem_save_t1_0 = NDR_PULL_GET_MEM_CTX(ndr);
-			NDR_PULL_SET_MEM_CTX(ndr, r->in.t1, 0);
-			NDR_CHECK(ndr_pull_spoolss_NotifyOptionsContainer(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.t1));
-			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_t1_0, 0);
+		if (r->in.notify_options) {
+			_mem_save_notify_options_0 = NDR_PULL_GET_MEM_CTX(ndr);
+			NDR_PULL_SET_MEM_CTX(ndr, r->in.notify_options, 0);
+			NDR_CHECK(ndr_pull_spoolss_NotifyOption(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.notify_options));
+			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_notify_options_0, 0);
 		}
 	}
 	if (flags & NDR_OUT) {
@@ -18291,19 +18291,19 @@ _PUBLIC_ void ndr_print_spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct ndr_
 		ndr->depth++;
 		ndr_print_policy_handle(ndr, "handle", r->in.handle);
 		ndr->depth--;
-		ndr_print_uint32(ndr, "flags", r->in.flags);
+		ndr_print_spoolss_PrinterChangeFlags(ndr, "flags", r->in.flags);
 		ndr_print_uint32(ndr, "options", r->in.options);
-		ndr_print_ptr(ndr, "str", r->in.str);
+		ndr_print_ptr(ndr, "local_machine", r->in.local_machine);
 		ndr->depth++;
-		if (r->in.str) {
-			ndr_print_string(ndr, "str", r->in.str);
+		if (r->in.local_machine) {
+			ndr_print_string(ndr, "local_machine", r->in.local_machine);
 		}
 		ndr->depth--;
 		ndr_print_uint32(ndr, "printer_local", r->in.printer_local);
-		ndr_print_ptr(ndr, "t1", r->in.t1);
+		ndr_print_ptr(ndr, "notify_options", r->in.notify_options);
 		ndr->depth++;
-		if (r->in.t1) {
-			ndr_print_spoolss_NotifyOptionsContainer(ndr, "t1", r->in.t1);
+		if (r->in.notify_options) {
+			ndr_print_spoolss_NotifyOption(ndr, "notify_options", r->in.notify_options);
 		}
 		ndr->depth--;
 		ndr->depth--;
@@ -18417,9 +18417,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_RouterRefreshPrinterChangeNotify(str
 		}
 		NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.handle));
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.change_low));
-		NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.container));
-		if (r->in.container) {
-			NDR_CHECK(ndr_push_spoolss_NotifyOptionsContainer(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.container));
+		NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.options));
+		if (r->in.options) {
+			NDR_CHECK(ndr_push_spoolss_NotifyOption(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.options));
 		}
 	}
 	if (flags & NDR_OUT) {
@@ -18437,10 +18437,10 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_RouterRefreshPrinterChangeNotify(str
 
 _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_RouterRefreshPrinterChangeNotify(struct ndr_pull *ndr, int flags, struct spoolss_RouterRefreshPrinterChangeNotify *r)
 {
-	uint32_t _ptr_container;
+	uint32_t _ptr_options;
 	uint32_t _ptr_info;
 	TALLOC_CTX *_mem_save_handle_0;
-	TALLOC_CTX *_mem_save_container_0;
+	TALLOC_CTX *_mem_save_options_0;
 	TALLOC_CTX *_mem_save_info_0;
 	TALLOC_CTX *_mem_save_info_1;
 	if (flags & NDR_IN) {
@@ -18454,17 +18454,17 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_RouterRefreshPrinterChangeNotify(str
 		NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.handle));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.change_low));
-		NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_container));
-		if (_ptr_container) {
-			NDR_PULL_ALLOC(ndr, r->in.container);
+		NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_options));
+		if (_ptr_options) {
+			NDR_PULL_ALLOC(ndr, r->in.options);
 		} else {
-			r->in.container = NULL;
+			r->in.options = NULL;
 		}
-		if (r->in.container) {
-			_mem_save_container_0 = NDR_PULL_GET_MEM_CTX(ndr);
-			NDR_PULL_SET_MEM_CTX(ndr, r->in.container, 0);
-			NDR_CHECK(ndr_pull_spoolss_NotifyOptionsContainer(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.container));
-			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_container_0, 0);
+		if (r->in.options) {
+			_mem_save_options_0 = NDR_PULL_GET_MEM_CTX(ndr);
+			NDR_PULL_SET_MEM_CTX(ndr, r->in.options, 0);
+			NDR_CHECK(ndr_pull_spoolss_NotifyOption(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.options));
+			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_options_0, 0);
 		}
 		NDR_PULL_ALLOC(ndr, r->out.info);
 		ZERO_STRUCTP(r->out.info);
@@ -18508,10 +18508,10 @@ _PUBLIC_ void ndr_print_spoolss_RouterRefreshPrinterChangeNotify(struct ndr_prin
 		ndr_print_policy_handle(ndr, "handle", r->in.handle);
 		ndr->depth--;
 		ndr_print_uint32(ndr, "change_low", r->in.change_low);
-		ndr_print_ptr(ndr, "container", r->in.container);
+		ndr_print_ptr(ndr, "options", r->in.options);
 		ndr->depth++;
-		if (r->in.container) {
-			ndr_print_spoolss_NotifyOptionsContainer(ndr, "container", r->in.container);
+		if (r->in.options) {
+			ndr_print_spoolss_NotifyOption(ndr, "options", r->in.options);
 		}
 		ndr->depth--;
 		ndr->depth--;
diff --git a/librpc/gen_ndr/ndr_spoolss.h b/librpc/gen_ndr/ndr_spoolss.h
index 12015e013c..bf68cdda50 100644
--- a/librpc/gen_ndr/ndr_spoolss.h
+++ b/librpc/gen_ndr/ndr_spoolss.h
@@ -320,8 +320,8 @@ void ndr_print_spoolss_MonitorInfo(struct ndr_print *ndr, const char *name, cons
 void ndr_print_spoolss_PrinterChangeFlags(struct ndr_print *ndr, const char *name, uint32_t r);
 void ndr_print_spoolss_Field(struct ndr_print *ndr, const char *name, enum spoolss_Field r);
 void ndr_print_spoolss_NotifyType(struct ndr_print *ndr, const char *name, enum spoolss_NotifyType r);
-void ndr_print_spoolss_NotifyOptionsArray(struct ndr_print *ndr, const char *name, const struct spoolss_NotifyOptionsArray *r);
-void ndr_print_spoolss_NotifyOptionsContainer(struct ndr_print *ndr, const char *name, const struct spoolss_NotifyOptionsContainer *r);
+void ndr_print_spoolss_NotifyOptionType(struct ndr_print *ndr, const char *name, const struct spoolss_NotifyOptionType *r);
+void ndr_print_spoolss_NotifyOption(struct ndr_print *ndr, const char *name, const struct spoolss_NotifyOption *r);
 void ndr_print_spoolss_NotifyString(struct ndr_print *ndr, const char *name, const struct spoolss_NotifyString *r);
 void ndr_print_spoolss_NotifyTable(struct ndr_print *ndr, const char *name, enum spoolss_NotifyTable r);
 void ndr_print_spoolss_NotifyData(struct ndr_print *ndr, const char *name, const union spoolss_NotifyData *r);
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index 7ac38a7eb8..dcd61650ba 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -1016,7 +1016,7 @@ enum spoolss_NotifyType
 #endif
 ;
 
-struct spoolss_NotifyOptionsArray {
+struct spoolss_NotifyOptionType {
 	enum spoolss_NotifyType type;
 	uint16_t u1;
 	uint32_t u2;
@@ -1025,11 +1025,11 @@ struct spoolss_NotifyOptionsArray {
 	enum spoolss_Field *fields;/* [unique,size_is(count)] */
 };
 
-struct spoolss_NotifyOptionsContainer {
+struct spoolss_NotifyOption {
 	uint32_t version;/* [value(2)] */
 	uint32_t flags;
 	uint32_t count;
-	struct spoolss_NotifyOptionsArray *options;/* [unique,size_is(count)] */
+	struct spoolss_NotifyOptionType *types;/* [unique,size_is(count)] */
 };
 
 struct spoolss_NotifyString {
@@ -2249,9 +2249,9 @@ struct spoolss_RemoteFindFirstPrinterChangeNotifyEx {
 		struct policy_handle *handle;/* [ref] */
 		uint32_t flags;
 		uint32_t options;
-		const char *str;/* [unique,charset(UTF16)] */
+		const char *local_machine;/* [unique,charset(UTF16)] */
 		uint32_t printer_local;
-		struct spoolss_NotifyOptionsContainer *t1;/* [unique] */
+		struct spoolss_NotifyOption *notify_options;/* [unique] */
 	} in;
 
 	struct {
@@ -2282,7 +2282,7 @@ struct spoolss_RouterRefreshPrinterChangeNotify {
 	struct {
 		struct policy_handle *handle;/* [ref] */
 		uint32_t change_low;
-		struct spoolss_NotifyOptionsContainer *container;/* [unique] */
+		struct spoolss_NotifyOption *options;/* [unique] */
 	} in;
 
 	struct {