r19919: Convert winreg_EnumKey to use ref ** instead of a unique *.

Volker
(This used to be commit b714b51884af0d79de8568410676d4889f23ffb6)

1 files changed, 82 insertions, 64 deletions

diff --git a/source3/librpc/gen_ndr/ndr_winreg.c b/source3/librpc/gen_ndr/ndr_winreg.c
index 9883fee784..8aaa571c3f 100644
--- a/source3/librpc/gen_ndr/ndr_winreg.c
+++ b/source3/librpc/gen_ndr/ndr_winreg.c
@@ -1294,26 +1294,26 @@ NTSTATUS ndr_push_winreg_EnumKey(struct ndr_push *ndr, int flags, const struct w
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.enum_index));
 		if (r->in.name == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
 		NDR_CHECK(ndr_push_winreg_StringBuf(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.name));
-		NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.keyclass));
-		if (r->in.keyclass) {
-			NDR_CHECK(ndr_push_winreg_StringBuf(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.keyclass));
-		}
-		NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.last_changed_time));
-		if (r->in.last_changed_time) {
-			NDR_CHECK(ndr_push_NTTIME(ndr, NDR_SCALARS, *r->in.last_changed_time));
-		}
+		if (r->in.keyclass == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+		if (*r->in.keyclass == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+		NDR_CHECK(ndr_push_ref_ptr(ndr));
+		NDR_CHECK(ndr_push_winreg_StringBuf(ndr, NDR_SCALARS|NDR_BUFFERS, *r->in.keyclass));
+		if (r->in.last_changed_time == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+		if (*r->in.last_changed_time == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+		NDR_CHECK(ndr_push_ref_ptr(ndr));
+		NDR_CHECK(ndr_push_NTTIME(ndr, NDR_SCALARS, **r->in.last_changed_time));
 	}
 	if (flags & NDR_OUT) {
 		if (r->out.name == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
 		NDR_CHECK(ndr_push_winreg_StringBuf(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.name));
-		NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.keyclass));
-		if (r->out.keyclass) {
-			NDR_CHECK(ndr_push_winreg_StringBuf(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.keyclass));
-		}
-		NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.last_changed_time));
-		if (r->out.last_changed_time) {
-			NDR_CHECK(ndr_push_NTTIME(ndr, NDR_SCALARS, *r->out.last_changed_time));
-		}
+		if (r->out.keyclass == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+		if (*r->out.keyclass == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+		NDR_CHECK(ndr_push_ref_ptr(ndr));
+		NDR_CHECK(ndr_push_winreg_StringBuf(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.keyclass));
+		if (r->out.last_changed_time == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+		if (*r->out.last_changed_time == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+		NDR_CHECK(ndr_push_ref_ptr(ndr));
+		NDR_CHECK(ndr_push_NTTIME(ndr, NDR_SCALARS, **r->out.last_changed_time));
 		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NT_STATUS_OK;
@@ -1326,7 +1326,9 @@ NTSTATUS ndr_pull_winreg_EnumKey(struct ndr_pull *ndr, int flags, struct winreg_
 	TALLOC_CTX *_mem_save_handle_0;
 	TALLOC_CTX *_mem_save_name_0;
 	TALLOC_CTX *_mem_save_keyclass_0;
+	TALLOC_CTX *_mem_save_keyclass_1;
 	TALLOC_CTX *_mem_save_last_changed_time_0;
+	TALLOC_CTX *_mem_save_last_changed_time_1;
 	if (flags & NDR_IN) {
 		ZERO_STRUCT(r->out);
 
@@ -1345,32 +1347,40 @@ NTSTATUS ndr_pull_winreg_EnumKey(struct ndr_pull *ndr, int flags, struct winreg_
 		NDR_PULL_SET_MEM_CTX(ndr, r->in.name, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_winreg_StringBuf(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.name));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_name_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_keyclass));
-		if (_ptr_keyclass) {
+		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->in.keyclass);
-		} else {
-			r->in.keyclass = NULL;
 		}
-		if (r->in.keyclass) {
-			_mem_save_keyclass_0 = NDR_PULL_GET_MEM_CTX(ndr);
-			NDR_PULL_SET_MEM_CTX(ndr, r->in.keyclass, 0);
-			NDR_CHECK(ndr_pull_winreg_StringBuf(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.keyclass));
-			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_keyclass_0, 0);
+		_mem_save_keyclass_0 = NDR_PULL_GET_MEM_CTX(ndr);
+		NDR_PULL_SET_MEM_CTX(ndr, r->in.keyclass, LIBNDR_FLAG_REF_ALLOC);
+		NDR_CHECK(ndr_pull_ref_ptr(ndr, &_ptr_keyclass));
+		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+			NDR_PULL_ALLOC(ndr, *r->in.keyclass);
 		}
-		NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_last_changed_time));
-		if (_ptr_last_changed_time) {
+		_mem_save_keyclass_1 = NDR_PULL_GET_MEM_CTX(ndr);
+		NDR_PULL_SET_MEM_CTX(ndr, *r->in.keyclass, LIBNDR_FLAG_REF_ALLOC);
+		NDR_CHECK(ndr_pull_winreg_StringBuf(ndr, NDR_SCALARS|NDR_BUFFERS, *r->in.keyclass));
+		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_keyclass_1, LIBNDR_FLAG_REF_ALLOC);
+		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_keyclass_0, LIBNDR_FLAG_REF_ALLOC);
+		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->in.last_changed_time);
-		} else {
-			r->in.last_changed_time = NULL;
 		}
-		if (r->in.last_changed_time) {
-			_mem_save_last_changed_time_0 = NDR_PULL_GET_MEM_CTX(ndr);
-			NDR_PULL_SET_MEM_CTX(ndr, r->in.last_changed_time, 0);
-			NDR_CHECK(ndr_pull_NTTIME(ndr, NDR_SCALARS, r->in.last_changed_time));
-			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_last_changed_time_0, 0);
+		_mem_save_last_changed_time_0 = NDR_PULL_GET_MEM_CTX(ndr);
+		NDR_PULL_SET_MEM_CTX(ndr, r->in.last_changed_time, LIBNDR_FLAG_REF_ALLOC);
+		NDR_CHECK(ndr_pull_ref_ptr(ndr, &_ptr_last_changed_time));
+		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+			NDR_PULL_ALLOC(ndr, *r->in.last_changed_time);
 		}
+		_mem_save_last_changed_time_1 = NDR_PULL_GET_MEM_CTX(ndr);
+		NDR_PULL_SET_MEM_CTX(ndr, *r->in.last_changed_time, LIBNDR_FLAG_REF_ALLOC);
+		NDR_CHECK(ndr_pull_NTTIME(ndr, NDR_SCALARS, *r->in.last_changed_time));
+		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_last_changed_time_1, LIBNDR_FLAG_REF_ALLOC);
+		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_last_changed_time_0, LIBNDR_FLAG_REF_ALLOC);
 		NDR_PULL_ALLOC(ndr, r->out.name);
 		*r->out.name = *r->in.name;
+		NDR_PULL_ALLOC(ndr, r->out.keyclass);
+		*r->out.keyclass = *r->in.keyclass;
+		NDR_PULL_ALLOC(ndr, r->out.last_changed_time);
+		*r->out.last_changed_time = *r->in.last_changed_time;
 	}
 	if (flags & NDR_OUT) {
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
@@ -1380,30 +1390,34 @@ NTSTATUS ndr_pull_winreg_EnumKey(struct ndr_pull *ndr, int flags, struct winreg_
 		NDR_PULL_SET_MEM_CTX(ndr, r->out.name, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_winreg_StringBuf(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.name));
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_name_0, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_keyclass));
-		if (_ptr_keyclass) {
+		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->out.keyclass);
-		} else {
-			r->out.keyclass = NULL;
 		}
-		if (r->out.keyclass) {
-			_mem_save_keyclass_0 = NDR_PULL_GET_MEM_CTX(ndr);
-			NDR_PULL_SET_MEM_CTX(ndr, r->out.keyclass, 0);
-			NDR_CHECK(ndr_pull_winreg_StringBuf(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.keyclass));
-			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_keyclass_0, 0);
+		_mem_save_keyclass_0 = NDR_PULL_GET_MEM_CTX(ndr);
+		NDR_PULL_SET_MEM_CTX(ndr, r->out.keyclass, LIBNDR_FLAG_REF_ALLOC);
+		NDR_CHECK(ndr_pull_ref_ptr(ndr, &_ptr_keyclass));
+		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+			NDR_PULL_ALLOC(ndr, *r->out.keyclass);
 		}
-		NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_last_changed_time));
-		if (_ptr_last_changed_time) {
+		_mem_save_keyclass_1 = NDR_PULL_GET_MEM_CTX(ndr);
+		NDR_PULL_SET_MEM_CTX(ndr, *r->out.keyclass, LIBNDR_FLAG_REF_ALLOC);
+		NDR_CHECK(ndr_pull_winreg_StringBuf(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.keyclass));
+		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_keyclass_1, LIBNDR_FLAG_REF_ALLOC);
+		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_keyclass_0, LIBNDR_FLAG_REF_ALLOC);
+		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->out.last_changed_time);
-		} else {
-			r->out.last_changed_time = NULL;
 		}
-		if (r->out.last_changed_time) {
-			_mem_save_last_changed_time_0 = NDR_PULL_GET_MEM_CTX(ndr);
-			NDR_PULL_SET_MEM_CTX(ndr, r->out.last_changed_time, 0);
-			NDR_CHECK(ndr_pull_NTTIME(ndr, NDR_SCALARS, r->out.last_changed_time));
-			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_last_changed_time_0, 0);
+		_mem_save_last_changed_time_0 = NDR_PULL_GET_MEM_CTX(ndr);
+		NDR_PULL_SET_MEM_CTX(ndr, r->out.last_changed_time, LIBNDR_FLAG_REF_ALLOC);
+		NDR_CHECK(ndr_pull_ref_ptr(ndr, &_ptr_last_changed_time));
+		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+			NDR_PULL_ALLOC(ndr, *r->out.last_changed_time);
 		}
+		_mem_save_last_changed_time_1 = NDR_PULL_GET_MEM_CTX(ndr);
+		NDR_PULL_SET_MEM_CTX(ndr, *r->out.last_changed_time, LIBNDR_FLAG_REF_ALLOC);
+		NDR_CHECK(ndr_pull_NTTIME(ndr, NDR_SCALARS, *r->out.last_changed_time));
+		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_last_changed_time_1, LIBNDR_FLAG_REF_ALLOC);
+		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_last_changed_time_0, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NT_STATUS_OK;
@@ -1430,15 +1444,17 @@ _PUBLIC_ void ndr_print_winreg_EnumKey(struct ndr_print *ndr, const char *name,
 		ndr->depth--;
 		ndr_print_ptr(ndr, "keyclass", r->in.keyclass);
 		ndr->depth++;
-		if (r->in.keyclass) {
-			ndr_print_winreg_StringBuf(ndr, "keyclass", r->in.keyclass);
-		}
+		ndr_print_ptr(ndr, "keyclass", *r->in.keyclass);
+		ndr->depth++;
+		ndr_print_winreg_StringBuf(ndr, "keyclass", *r->in.keyclass);
+		ndr->depth--;
 		ndr->depth--;
 		ndr_print_ptr(ndr, "last_changed_time", r->in.last_changed_time);
 		ndr->depth++;
-		if (r->in.last_changed_time) {
-			ndr_print_NTTIME(ndr, "last_changed_time", *r->in.last_changed_time);
-		}
+		ndr_print_ptr(ndr, "last_changed_time", *r->in.last_changed_time);
+		ndr->depth++;
+		ndr_print_NTTIME(ndr, "last_changed_time", **r->in.last_changed_time);
+		ndr->depth--;
 		ndr->depth--;
 		ndr->depth--;
 	}
@@ -1451,15 +1467,17 @@ _PUBLIC_ void ndr_print_winreg_EnumKey(struct ndr_print *ndr, const char *name,
 		ndr->depth--;
 		ndr_print_ptr(ndr, "keyclass", r->out.keyclass);
 		ndr->depth++;
-		if (r->out.keyclass) {
-			ndr_print_winreg_StringBuf(ndr, "keyclass", r->out.keyclass);
-		}
+		ndr_print_ptr(ndr, "keyclass", *r->out.keyclass);
+		ndr->depth++;
+		ndr_print_winreg_StringBuf(ndr, "keyclass", *r->out.keyclass);
+		ndr->depth--;
 		ndr->depth--;
 		ndr_print_ptr(ndr, "last_changed_time", r->out.last_changed_time);
 		ndr->depth++;
-		if (r->out.last_changed_time) {
-			ndr_print_NTTIME(ndr, "last_changed_time", *r->out.last_changed_time);
-		}
+		ndr_print_ptr(ndr, "last_changed_time", *r->out.last_changed_time);
+		ndr->depth++;
+		ndr_print_NTTIME(ndr, "last_changed_time", **r->out.last_changed_time);
+		ndr->depth--;
 		ndr->depth--;
 		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;