The Samba-Bugzilla – Attachment 5391 Details for
Bug 6888
REGRESSION: printing support for 64 bit windows clients broken
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for 3.5
spoolss_64bit-v3-5-test.patch (text/plain), 307.55 KB, created by
Guenther Deschner
on 2010-02-18 19:49:58 UTC
(
hide
)
Description:
patch for 3.5
Filename:
MIME Type:
Creator:
Guenther Deschner
Created:
2010-02-18 19:49:58 UTC
Size:
307.55 KB
patch
obsolete
>From 62ff4b6244d10505f9a26c8dc278dc3191415746 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Mon, 14 Dec 2009 14:08:34 +0100 >Subject: [PATCH 01/24] libndr: add ndr_push_relative_ptr2_start and ndr_push_relative_ptr2_end. > >Guenther >--- > librpc/ndr/libndr.h | 2 ++ > librpc/ndr/ndr.c | 24 ++++++++++++++++++++++++ > 2 files changed, 26 insertions(+), 0 deletions(-) > >diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h >index 45cb244..febac24 100644 >--- a/librpc/ndr/libndr.h >+++ b/librpc/ndr/libndr.h >@@ -383,6 +383,8 @@ enum ndr_err_code ndr_push_setup_relative_base_offset1(struct ndr_push *ndr, con > enum ndr_err_code ndr_push_setup_relative_base_offset2(struct ndr_push *ndr, const void *p); > enum ndr_err_code ndr_push_relative_ptr1(struct ndr_push *ndr, const void *p); > enum ndr_err_code ndr_push_relative_ptr2(struct ndr_push *ndr, const void *p); >+enum ndr_err_code ndr_push_relative_ptr2_start(struct ndr_push *ndr, const void *p); >+enum ndr_err_code ndr_push_relative_ptr2_end(struct ndr_push *ndr, const void *p); > uint32_t ndr_pull_get_relative_base_offset(struct ndr_pull *ndr); > void ndr_pull_restore_relative_base_offset(struct ndr_pull *ndr, uint32_t offset); > enum ndr_err_code ndr_pull_setup_relative_base_offset1(struct ndr_pull *ndr, const void *p, uint32_t offset); >diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c >index cb47ca1..ad77942 100644 >--- a/librpc/ndr/ndr.c >+++ b/librpc/ndr/ndr.c >@@ -1088,6 +1088,30 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2(struct ndr_push *ndr, const vo > } > > /* >+ push a relative object - stage2 start >+ this is called during buffers processing >+*/ >+_PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_start(struct ndr_push *ndr, const void *p) >+{ >+ if (p == NULL) { >+ return NDR_ERR_SUCCESS; >+ } >+ return ndr_push_relative_ptr2(ndr, p); >+} >+ >+/* >+ push a relative object - stage2 end >+ this is called during buffers processing >+*/ >+_PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_end(struct ndr_push *ndr, const void *p) >+{ >+ if (p == NULL) { >+ return NDR_ERR_SUCCESS; >+ } >+ return NDR_ERR_SUCCESS; >+} >+ >+/* > get the current base for relative pointers for the pull > */ > _PUBLIC_ uint32_t ndr_pull_get_relative_base_offset(struct ndr_pull *ndr) >-- >1.6.6 > > >From 749354d27d708ea6cd8cca2064093d755db23615 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Mon, 14 Dec 2009 14:09:22 +0100 >Subject: [PATCH 02/24] pidl: use ndr_push_relative_ptr2_start and ndr_push_relative_ptr2_end. > >Guenther >(cherry picked from commit a049d75193b284fe9efb28d303ea46ba407e5a7a) >--- > pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > >diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm >index 820aee6..da536be 100644 >--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm >+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm >@@ -567,17 +567,21 @@ sub ParseElementPushLevel > } > > if ($l->{TYPE} eq "POINTER" and $deferred) { >+ my $rel_var_name = $var_name; > if ($l->{POINTER_TYPE} ne "ref") { > $self->pidl("if ($var_name) {"); > $self->indent; > if ($l->{POINTER_TYPE} eq "relative") { >- $self->pidl("NDR_CHECK(ndr_push_relative_ptr2($ndr, $var_name));"); >+ $self->pidl("NDR_CHECK(ndr_push_relative_ptr2_start($ndr, $rel_var_name));"); > } > } > $var_name = get_value_of($var_name); > $self->ParseElementPushLevel($e, GetNextLevel($e, $l), $ndr, $var_name, $env, 1, 1); > > if ($l->{POINTER_TYPE} ne "ref") { >+ if ($l->{POINTER_TYPE} eq "relative") { >+ $self->pidl("NDR_CHECK(ndr_push_relative_ptr2_end($ndr, $rel_var_name));"); >+ } > $self->deindent; > $self->pidl("}"); > } >-- >1.6.6 > > >From b1e672730fcb0013a121c9c7bc1c4f2c2faaaddd Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Mon, 14 Dec 2009 14:17:05 +0100 >Subject: [PATCH 03/24] s3: re-run make full_idl. > >Guenther >(cherry picked from commit c869328b1642043480f9600c88bcce9da37959b1) >--- > librpc/gen_ndr/ndr_drsblobs.c | 24 ++- > librpc/gen_ndr/ndr_krb5pac.c | 3 +- > librpc/gen_ndr/ndr_ntlmssp.c | 30 ++- > librpc/gen_ndr/ndr_security.c | 12 +- > librpc/gen_ndr/ndr_spoolss.c | 423 +++++++++++++++++++++++++++-------------- > librpc/gen_ndr/ndr_svcctl.c | 24 ++- > 6 files changed, 344 insertions(+), 172 deletions(-) > >diff --git a/librpc/gen_ndr/ndr_drsblobs.c b/librpc/gen_ndr/ndr_drsblobs.c >index 8a0842b..33ebf4c 100644 >--- a/librpc/gen_ndr/ndr_drsblobs.c >+++ b/librpc/gen_ndr/ndr_drsblobs.c >@@ -534,8 +534,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_repsFromTo1(struct ndr_push *ndr, int ndr_fl > } > if (ndr_flags & NDR_BUFFERS) { > if (r->other_info) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->other_info)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->other_info)); > NDR_CHECK(ndr_push_repsFromTo1OtherInfo(ndr, NDR_SCALARS, r->other_info)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->other_info)); > } > } > ndr->flags = _flags_save_STRUCT; >@@ -657,8 +658,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_repsFromTo2OtherInfo(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->dns_name1) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->dns_name1)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dns_name1)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->dns_name1)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->dns_name1)); > } > ndr->flags = _flags_save_string; > } >@@ -666,8 +668,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_repsFromTo2OtherInfo(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->dns_name2) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->dns_name2)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dns_name2)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->dns_name2)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->dns_name2)); > } > ndr->flags = _flags_save_string; > } >@@ -805,8 +808,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_repsFromTo2(struct ndr_push *ndr, int ndr_fl > } > if (ndr_flags & NDR_BUFFERS) { > if (r->other_info) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->other_info)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->other_info)); > NDR_CHECK(ndr_push_repsFromTo2OtherInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->other_info)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->other_info)); > } > } > ndr->flags = _flags_save_STRUCT; >@@ -1794,13 +1798,14 @@ static enum ndr_err_code ndr_push_package_PrimaryKerberosString(struct ndr_push > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_REMAINING); > if (r->string) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->string)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->string)); > { > struct ndr_push *_ndr_string; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_string, 0, 2 * strlen_m(r->string))); > NDR_CHECK(ndr_push_string(_ndr_string, NDR_SCALARS, r->string)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_string, 0, 2 * strlen_m(r->string))); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->string)); > } > ndr->flags = _flags_save_string; > } >@@ -1892,13 +1897,14 @@ static enum ndr_err_code ndr_push_package_PrimaryKerberosKey3(struct ndr_push *n > uint32_t _flags_save_DATA_BLOB = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING); > if (r->value) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->value)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->value)); > { > struct ndr_push *_ndr_value; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_value, 0, (r->value?r->value->length:0))); > NDR_CHECK(ndr_push_DATA_BLOB(_ndr_value, NDR_SCALARS, *r->value)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_value, 0, (r->value?r->value->length:0))); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->value)); > } > ndr->flags = _flags_save_DATA_BLOB; > } >@@ -2118,13 +2124,14 @@ static enum ndr_err_code ndr_push_package_PrimaryKerberosKey4(struct ndr_push *n > uint32_t _flags_save_DATA_BLOB = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING); > if (r->value) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->value)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->value)); > { > struct ndr_push *_ndr_value; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_value, 0, (r->value?r->value->length:0))); > NDR_CHECK(ndr_push_DATA_BLOB(_ndr_value, NDR_SCALARS, *r->value)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_value, 0, (r->value?r->value->length:0))); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->value)); > } > ndr->flags = _flags_save_DATA_BLOB; > } >@@ -3001,8 +3008,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_trustCurrentPasswords(struct ndr_push *ndr, > if (ndr_flags & NDR_BUFFERS) { > for (cntr_current_0 = 0; cntr_current_0 < r->count; cntr_current_0++) { > if (r->current[cntr_current_0]) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->current[cntr_current_0])); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->current[cntr_current_0])); > NDR_CHECK(ndr_push_AuthenticationInformation(ndr, NDR_SCALARS, r->current[cntr_current_0])); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->current[cntr_current_0])); > } > } > } >diff --git a/librpc/gen_ndr/ndr_krb5pac.c b/librpc/gen_ndr/ndr_krb5pac.c >index 0f4cfef..1f5ed95 100644 >--- a/librpc/gen_ndr/ndr_krb5pac.c >+++ b/librpc/gen_ndr/ndr_krb5pac.c >@@ -535,13 +535,14 @@ _PUBLIC_ enum ndr_err_code ndr_push_PAC_BUFFER_RAW(struct ndr_push *ndr, int ndr > uint32_t _flags_save_DATA_BLOB_REM = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN8); > if (r->info) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->info)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->info)); > { > struct ndr_push *_ndr_info; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_info, 0, NDR_ROUND(r->ndr_size, 8))); > NDR_CHECK(ndr_push_DATA_BLOB_REM(_ndr_info, NDR_SCALARS, r->info)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_info, 0, NDR_ROUND(r->ndr_size, 8))); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->info)); > } > ndr->flags = _flags_save_DATA_BLOB_REM; > } >diff --git a/librpc/gen_ndr/ndr_ntlmssp.c b/librpc/gen_ndr/ndr_ntlmssp.c >index b863826..130b8fe 100644 >--- a/librpc/gen_ndr/ndr_ntlmssp.c >+++ b/librpc/gen_ndr/ndr_ntlmssp.c >@@ -286,13 +286,14 @@ _PUBLIC_ enum ndr_err_code ndr_push_NEGOTIATE_MESSAGE(struct ndr_push *ndr, int > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, ndr_ntlmssp_negotiated_string_flags(NTLMSSP_NEGOTIATE_OEM)); > if (r->DomainName) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->DomainName)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->DomainName)); > { > struct ndr_push *_ndr_DomainName; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_DomainName, 0, strlen(r->DomainName))); > NDR_CHECK(ndr_push_string(_ndr_DomainName, NDR_SCALARS, r->DomainName)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_DomainName, 0, strlen(r->DomainName))); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->DomainName)); > } > ndr->flags = _flags_save_string; > } >@@ -300,13 +301,14 @@ _PUBLIC_ enum ndr_err_code ndr_push_NEGOTIATE_MESSAGE(struct ndr_push *ndr, int > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, ndr_ntlmssp_negotiated_string_flags(NTLMSSP_NEGOTIATE_OEM)); > if (r->Workstation) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->Workstation)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->Workstation)); > { > struct ndr_push *_ndr_Workstation; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_Workstation, 0, strlen(r->Workstation))); > NDR_CHECK(ndr_push_string(_ndr_Workstation, NDR_SCALARS, r->Workstation)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_Workstation, 0, strlen(r->Workstation))); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->Workstation)); > } > ndr->flags = _flags_save_string; > } >@@ -1006,24 +1008,26 @@ _PUBLIC_ enum ndr_err_code ndr_push_CHALLENGE_MESSAGE(struct ndr_push *ndr, int > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, ndr_ntlmssp_negotiated_string_flags(r->NegotiateFlags)); > if (r->TargetName) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->TargetName)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->TargetName)); > { > struct ndr_push *_ndr_TargetName; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_TargetName, 0, ndr_ntlmssp_string_length(r->NegotiateFlags, r->TargetName))); > NDR_CHECK(ndr_push_string(_ndr_TargetName, NDR_SCALARS, r->TargetName)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_TargetName, 0, ndr_ntlmssp_string_length(r->NegotiateFlags, r->TargetName))); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->TargetName)); > } > ndr->flags = _flags_save_string; > } > if (r->TargetInfo) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->TargetInfo)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->TargetInfo)); > { > struct ndr_push *_ndr_TargetInfo; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_TargetInfo, 0, ndr_size_AV_PAIR_LIST(r->TargetInfo, ndr->iconv_convenience, ndr->flags))); > NDR_CHECK(ndr_push_AV_PAIR_LIST(_ndr_TargetInfo, NDR_SCALARS|NDR_BUFFERS, r->TargetInfo)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_TargetInfo, 0, ndr_size_AV_PAIR_LIST(r->TargetInfo, ndr->iconv_convenience, ndr->flags))); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->TargetInfo)); > } > NDR_CHECK(ndr_push_ntlmssp_Version(ndr, NDR_BUFFERS, &r->Version)); > } >@@ -1664,7 +1668,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_AUTHENTICATE_MESSAGE(struct ndr_push *ndr, i > } > if (ndr_flags & NDR_BUFFERS) { > if (r->LmChallengeResponse) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->LmChallengeResponse)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->LmChallengeResponse)); > { > struct ndr_push *_ndr_LmChallengeResponse; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_LmChallengeResponse, 0, r->LmChallengeResponseLen)); >@@ -1672,9 +1676,10 @@ _PUBLIC_ enum ndr_err_code ndr_push_AUTHENTICATE_MESSAGE(struct ndr_push *ndr, i > NDR_CHECK(ndr_push_ntlmssp_LM_RESPONSE(_ndr_LmChallengeResponse, NDR_SCALARS|NDR_BUFFERS, r->LmChallengeResponse)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_LmChallengeResponse, 0, r->LmChallengeResponseLen)); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->LmChallengeResponse)); > } > if (r->NtChallengeResponse) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->NtChallengeResponse)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->NtChallengeResponse)); > { > struct ndr_push *_ndr_NtChallengeResponse; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_NtChallengeResponse, 0, r->NtChallengeResponseLen)); >@@ -1682,18 +1687,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_AUTHENTICATE_MESSAGE(struct ndr_push *ndr, i > NDR_CHECK(ndr_push_ntlmssp_NTLM_RESPONSE(_ndr_NtChallengeResponse, NDR_SCALARS|NDR_BUFFERS, r->NtChallengeResponse)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_NtChallengeResponse, 0, r->NtChallengeResponseLen)); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->NtChallengeResponse)); > } > { > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, ndr_ntlmssp_negotiated_string_flags(r->NegotiateFlags)); > if (r->DomainName) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->DomainName)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->DomainName)); > { > struct ndr_push *_ndr_DomainName; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_DomainName, 0, ndr_ntlmssp_string_length(r->NegotiateFlags, r->DomainName))); > NDR_CHECK(ndr_push_string(_ndr_DomainName, NDR_SCALARS, r->DomainName)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_DomainName, 0, ndr_ntlmssp_string_length(r->NegotiateFlags, r->DomainName))); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->DomainName)); > } > ndr->flags = _flags_save_string; > } >@@ -1701,13 +1708,14 @@ _PUBLIC_ enum ndr_err_code ndr_push_AUTHENTICATE_MESSAGE(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, ndr_ntlmssp_negotiated_string_flags(r->NegotiateFlags)); > if (r->UserName) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->UserName)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->UserName)); > { > struct ndr_push *_ndr_UserName; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_UserName, 0, ndr_ntlmssp_string_length(r->NegotiateFlags, r->UserName))); > NDR_CHECK(ndr_push_string(_ndr_UserName, NDR_SCALARS, r->UserName)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_UserName, 0, ndr_ntlmssp_string_length(r->NegotiateFlags, r->UserName))); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->UserName)); > } > ndr->flags = _flags_save_string; > } >@@ -1715,24 +1723,26 @@ _PUBLIC_ enum ndr_err_code ndr_push_AUTHENTICATE_MESSAGE(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, ndr_ntlmssp_negotiated_string_flags(r->NegotiateFlags)); > if (r->Workstation) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->Workstation)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->Workstation)); > { > struct ndr_push *_ndr_Workstation; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_Workstation, 0, ndr_ntlmssp_string_length(r->NegotiateFlags, r->Workstation))); > NDR_CHECK(ndr_push_string(_ndr_Workstation, NDR_SCALARS, r->Workstation)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_Workstation, 0, ndr_ntlmssp_string_length(r->NegotiateFlags, r->Workstation))); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->Workstation)); > } > ndr->flags = _flags_save_string; > } > if (r->EncryptedRandomSessionKey) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->EncryptedRandomSessionKey)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->EncryptedRandomSessionKey)); > { > struct ndr_push *_ndr_EncryptedRandomSessionKey; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_EncryptedRandomSessionKey, 0, r->EncryptedRandomSessionKey->length)); > NDR_CHECK(ndr_push_DATA_BLOB(_ndr_EncryptedRandomSessionKey, NDR_SCALARS, *r->EncryptedRandomSessionKey)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_EncryptedRandomSessionKey, 0, r->EncryptedRandomSessionKey->length)); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->EncryptedRandomSessionKey)); > } > NDR_CHECK(ndr_push_ntlmssp_Version(ndr, NDR_BUFFERS, &r->Version)); > } >diff --git a/librpc/gen_ndr/ndr_security.c b/librpc/gen_ndr/ndr_security.c >index 5453d0c..8ceb430 100644 >--- a/librpc/gen_ndr/ndr_security.c >+++ b/librpc/gen_ndr/ndr_security.c >@@ -630,20 +630,24 @@ _PUBLIC_ enum ndr_err_code ndr_push_security_descriptor(struct ndr_push *ndr, in > } > if (ndr_flags & NDR_BUFFERS) { > if (r->owner_sid) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->owner_sid)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->owner_sid)); > NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, r->owner_sid)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->owner_sid)); > } > if (r->group_sid) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->group_sid)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->group_sid)); > NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, r->group_sid)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->group_sid)); > } > if (r->sacl) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->sacl)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->sacl)); > NDR_CHECK(ndr_push_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->sacl)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->sacl)); > } > if (r->dacl) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->dacl)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dacl)); > NDR_CHECK(ndr_push_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->dacl)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->dacl)); > } > } > ndr->flags = _flags_save_STRUCT; >diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c >index 9cb83b5..d5eeead 100644 >--- a/librpc/gen_ndr/ndr_spoolss.c >+++ b/librpc/gen_ndr/ndr_spoolss.c >@@ -358,8 +358,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo0(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->printername) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->printername)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printername)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printername)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->printername)); > } > ndr->flags = _flags_save_string; > } >@@ -367,8 +368,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo0(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->servername) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->servername)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->servername)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->servername)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->servername)); > } > ndr->flags = _flags_save_string; > } >@@ -1307,8 +1309,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->description) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->description)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->description)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->description)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->description)); > } > ndr->flags = _flags_save_string; > } >@@ -1316,8 +1319,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->name)); > } > ndr->flags = _flags_save_string; > } >@@ -1325,8 +1329,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->comment) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->comment)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->comment)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->comment)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->comment)); > } > ndr->flags = _flags_save_string; > } >@@ -1551,8 +1556,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->servername) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->servername)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->servername)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->servername)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->servername)); > } > ndr->flags = _flags_save_string; > } >@@ -1560,8 +1566,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->printername) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->printername)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printername)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printername)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->printername)); > } > ndr->flags = _flags_save_string; > } >@@ -1569,8 +1576,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->sharename) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->sharename)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->sharename)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->sharename)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->sharename)); > } > ndr->flags = _flags_save_string; > } >@@ -1578,8 +1586,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->portname) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->portname)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->portname)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->portname)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->portname)); > } > ndr->flags = _flags_save_string; > } >@@ -1587,8 +1596,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->drivername) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->drivername)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->drivername)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->drivername)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->drivername)); > } > ndr->flags = _flags_save_string; > } >@@ -1596,8 +1606,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->comment) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->comment)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->comment)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->comment)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->comment)); > } > ndr->flags = _flags_save_string; > } >@@ -1605,26 +1616,29 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->location) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->location)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->location)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->location)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->location)); > } > ndr->flags = _flags_save_string; > } > if (r->devmode) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->devmode)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode)); > { > struct ndr_push *_ndr_devmode; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_devmode, 0, -1)); > NDR_CHECK(ndr_push_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_devmode, 0, -1)); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode)); > } > { > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->sepfile) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->sepfile)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->sepfile)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->sepfile)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->sepfile)); > } > ndr->flags = _flags_save_string; > } >@@ -1632,8 +1646,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->printprocessor) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->printprocessor)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printprocessor)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printprocessor)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->printprocessor)); > } > ndr->flags = _flags_save_string; > } >@@ -1641,8 +1656,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->datatype) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->datatype)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->datatype)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->datatype)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->datatype)); > } > ndr->flags = _flags_save_string; > } >@@ -1650,19 +1666,21 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->parameters) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->parameters)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->parameters)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->parameters)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->parameters)); > } > ndr->flags = _flags_save_string; > } > if (r->secdesc) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->secdesc)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); > { > struct ndr_push *_ndr_secdesc; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); > NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); > } > } > return NDR_ERR_SUCCESS; >@@ -2164,13 +2182,14 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo3(struct ndr_push *ndr, i > } > if (ndr_flags & NDR_BUFFERS) { > if (r->secdesc) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->secdesc)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); > { > struct ndr_push *_ndr_secdesc; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); > NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); > } > } > return NDR_ERR_SUCCESS; >@@ -2253,8 +2272,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo4(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->printername) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->printername)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printername)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printername)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->printername)); > } > ndr->flags = _flags_save_string; > } >@@ -2262,8 +2282,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo4(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->servername) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->servername)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->servername)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->servername)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->servername)); > } > ndr->flags = _flags_save_string; > } >@@ -2392,8 +2413,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo5(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->printername) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->printername)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printername)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printername)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->printername)); > } > ndr->flags = _flags_save_string; > } >@@ -2401,8 +2423,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo5(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->portname) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->portname)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->portname)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->portname)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->portname)); > } > ndr->flags = _flags_save_string; > } >@@ -2590,8 +2613,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo7(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->guid) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->guid)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->guid)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->guid)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->guid)); > } > ndr->flags = _flags_save_string; > } >@@ -2668,13 +2692,14 @@ static enum ndr_err_code ndr_push_spoolss_DeviceModeInfo(struct ndr_push *ndr, i > } > if (ndr_flags & NDR_BUFFERS) { > if (r->devmode) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->devmode)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode)); > { > struct ndr_push *_ndr_devmode; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_devmode, 0, -1)); > NDR_CHECK(ndr_push_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_devmode, 0, -1)); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode)); > } > } > return NDR_ERR_SUCCESS; >@@ -3153,8 +3178,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->printer_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->printer_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printer_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printer_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->printer_name)); > } > ndr->flags = _flags_save_string; > } >@@ -3162,8 +3188,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->server_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->server_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->server_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->server_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->server_name)); > } > ndr->flags = _flags_save_string; > } >@@ -3171,8 +3198,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->user_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->user_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->user_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->user_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->user_name)); > } > ndr->flags = _flags_save_string; > } >@@ -3180,8 +3208,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->document_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->document_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->document_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->document_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->document_name)); > } > ndr->flags = _flags_save_string; > } >@@ -3189,8 +3218,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->data_type) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->data_type)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_type)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_type)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->data_type)); > } > ndr->flags = _flags_save_string; > } >@@ -3198,8 +3228,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->text_status) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->text_status)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->text_status)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->text_status)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->text_status)); > } > ndr->flags = _flags_save_string; > } >@@ -3541,8 +3572,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->printer_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->printer_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printer_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printer_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->printer_name)); > } > ndr->flags = _flags_save_string; > } >@@ -3550,8 +3582,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->server_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->server_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->server_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->server_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->server_name)); > } > ndr->flags = _flags_save_string; > } >@@ -3559,8 +3592,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->user_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->user_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->user_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->user_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->user_name)); > } > ndr->flags = _flags_save_string; > } >@@ -3568,8 +3602,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->document_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->document_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->document_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->document_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->document_name)); > } > ndr->flags = _flags_save_string; > } >@@ -3577,8 +3612,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->notify_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->notify_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->notify_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->notify_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->notify_name)); > } > ndr->flags = _flags_save_string; > } >@@ -3586,8 +3622,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->data_type) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->data_type)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_type)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_type)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->data_type)); > } > ndr->flags = _flags_save_string; > } >@@ -3595,8 +3632,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->print_processor) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->print_processor)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->print_processor)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->print_processor)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->print_processor)); > } > ndr->flags = _flags_save_string; > } >@@ -3604,8 +3642,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->parameters) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->parameters)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->parameters)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->parameters)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->parameters)); > } > ndr->flags = _flags_save_string; > } >@@ -3613,27 +3652,31 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_name)); > } > ndr->flags = _flags_save_string; > } > if (r->devmode) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->devmode)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode)); > NDR_CHECK(ndr_push_spoolss_DeviceMode(ndr, NDR_SCALARS, r->devmode)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode)); > } > { > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->text_status) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->text_status)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->text_status)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->text_status)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->text_status)); > } > ndr->flags = _flags_save_string; > } > if (r->secdesc) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->secdesc)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); > NDR_CHECK(ndr_push_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); > } > } > return NDR_ERR_SUCCESS; >@@ -4215,8 +4258,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->printer_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->printer_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printer_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printer_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->printer_name)); > } > ndr->flags = _flags_save_string; > } >@@ -4224,8 +4268,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->server_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->server_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->server_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->server_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->server_name)); > } > ndr->flags = _flags_save_string; > } >@@ -4233,8 +4278,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->user_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->user_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->user_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->user_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->user_name)); > } > ndr->flags = _flags_save_string; > } >@@ -4242,8 +4288,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->document_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->document_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->document_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->document_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->document_name)); > } > ndr->flags = _flags_save_string; > } >@@ -4251,8 +4298,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->notify_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->notify_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->notify_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->notify_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->notify_name)); > } > ndr->flags = _flags_save_string; > } >@@ -4260,8 +4308,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->data_type) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->data_type)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_type)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_type)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->data_type)); > } > ndr->flags = _flags_save_string; > } >@@ -4269,8 +4318,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->print_processor) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->print_processor)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->print_processor)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->print_processor)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->print_processor)); > } > ndr->flags = _flags_save_string; > } >@@ -4278,8 +4328,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->parameters) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->parameters)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->parameters)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->parameters)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->parameters)); > } > ndr->flags = _flags_save_string; > } >@@ -4287,27 +4338,31 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_name)); > } > ndr->flags = _flags_save_string; > } > if (r->devmode) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->devmode)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode)); > NDR_CHECK(ndr_push_spoolss_DeviceMode(ndr, NDR_SCALARS, r->devmode)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode)); > } > { > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->text_status) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->text_status)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->text_status)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->text_status)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->text_status)); > } > ndr->flags = _flags_save_string; > } > if (r->secdesc) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->secdesc)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); > NDR_CHECK(ndr_push_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); > } > } > return NDR_ERR_SUCCESS; >@@ -10429,8 +10484,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo1(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_name)); > } > ndr->flags = _flags_save_string; > } >@@ -10538,8 +10594,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo2(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_name)); > } > ndr->flags = _flags_save_string; > } >@@ -10547,8 +10604,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo2(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->architecture) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->architecture)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->architecture)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->architecture)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->architecture)); > } > ndr->flags = _flags_save_string; > } >@@ -10556,8 +10614,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo2(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_path) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_path)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_path)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_path)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_path)); > } > ndr->flags = _flags_save_string; > } >@@ -10565,8 +10624,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo2(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->data_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->data_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->data_file)); > } > ndr->flags = _flags_save_string; > } >@@ -10574,8 +10634,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo2(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->config_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->config_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->config_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->config_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->config_file)); > } > ndr->flags = _flags_save_string; > } >@@ -10849,8 +10910,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_name)); > } > ndr->flags = _flags_save_string; > } >@@ -10858,8 +10920,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->architecture) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->architecture)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->architecture)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->architecture)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->architecture)); > } > ndr->flags = _flags_save_string; > } >@@ -10867,8 +10930,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_path) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_path)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_path)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_path)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_path)); > } > ndr->flags = _flags_save_string; > } >@@ -10876,8 +10940,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->data_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->data_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->data_file)); > } > ndr->flags = _flags_save_string; > } >@@ -10885,8 +10950,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->config_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->config_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->config_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->config_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->config_file)); > } > ndr->flags = _flags_save_string; > } >@@ -10894,8 +10960,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->help_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->help_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->help_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->help_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->help_file)); > } > ndr->flags = _flags_save_string; > } >@@ -10903,8 +10970,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > uint32_t _flags_save_string_array = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->dependent_files) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->dependent_files)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dependent_files)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->dependent_files)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->dependent_files)); > } > ndr->flags = _flags_save_string_array; > } >@@ -10912,8 +10980,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->monitor_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->monitor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->monitor_name)); > } > ndr->flags = _flags_save_string; > } >@@ -10921,8 +10990,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->default_datatype) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->default_datatype)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->default_datatype)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->default_datatype)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->default_datatype)); > } > ndr->flags = _flags_save_string; > } >@@ -11342,8 +11412,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_name)); > } > ndr->flags = _flags_save_string; > } >@@ -11351,8 +11422,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->architecture) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->architecture)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->architecture)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->architecture)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->architecture)); > } > ndr->flags = _flags_save_string; > } >@@ -11360,8 +11432,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_path) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_path)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_path)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_path)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_path)); > } > ndr->flags = _flags_save_string; > } >@@ -11369,8 +11442,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->data_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->data_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->data_file)); > } > ndr->flags = _flags_save_string; > } >@@ -11378,8 +11452,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->config_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->config_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->config_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->config_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->config_file)); > } > ndr->flags = _flags_save_string; > } >@@ -11387,8 +11462,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->help_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->help_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->help_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->help_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->help_file)); > } > ndr->flags = _flags_save_string; > } >@@ -11396,8 +11472,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > uint32_t _flags_save_string_array = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->dependent_files) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->dependent_files)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dependent_files)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->dependent_files)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->dependent_files)); > } > ndr->flags = _flags_save_string_array; > } >@@ -11405,8 +11482,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->monitor_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->monitor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->monitor_name)); > } > ndr->flags = _flags_save_string; > } >@@ -11414,8 +11492,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->default_datatype) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->default_datatype)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->default_datatype)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->default_datatype)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->default_datatype)); > } > ndr->flags = _flags_save_string; > } >@@ -11423,8 +11502,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > uint32_t _flags_save_string_array = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->previous_names) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->previous_names)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->previous_names)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->previous_names)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->previous_names)); > } > ndr->flags = _flags_save_string_array; > } >@@ -11852,8 +11932,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo5(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_name)); > } > ndr->flags = _flags_save_string; > } >@@ -11861,8 +11942,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo5(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->architecture) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->architecture)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->architecture)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->architecture)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->architecture)); > } > ndr->flags = _flags_save_string; > } >@@ -11870,8 +11952,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo5(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_path) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_path)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_path)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_path)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_path)); > } > ndr->flags = _flags_save_string; > } >@@ -11879,8 +11962,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo5(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->data_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->data_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->data_file)); > } > ndr->flags = _flags_save_string; > } >@@ -11888,8 +11972,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo5(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->config_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->config_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->config_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->config_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->config_file)); > } > ndr->flags = _flags_save_string; > } >@@ -12201,8 +12286,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_name)); > } > ndr->flags = _flags_save_string; > } >@@ -12210,8 +12296,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->architecture) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->architecture)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->architecture)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->architecture)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->architecture)); > } > ndr->flags = _flags_save_string; > } >@@ -12219,8 +12306,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_path) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_path)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_path)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_path)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_path)); > } > ndr->flags = _flags_save_string; > } >@@ -12228,8 +12316,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->data_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->data_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->data_file)); > } > ndr->flags = _flags_save_string; > } >@@ -12237,8 +12326,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->config_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->config_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->config_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->config_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->config_file)); > } > ndr->flags = _flags_save_string; > } >@@ -12246,8 +12336,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->help_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->help_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->help_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->help_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->help_file)); > } > ndr->flags = _flags_save_string; > } >@@ -12255,8 +12346,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > uint32_t _flags_save_string_array = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->dependent_files) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->dependent_files)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dependent_files)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->dependent_files)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->dependent_files)); > } > ndr->flags = _flags_save_string_array; > } >@@ -12264,8 +12356,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->monitor_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->monitor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->monitor_name)); > } > ndr->flags = _flags_save_string; > } >@@ -12273,8 +12366,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->default_datatype) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->default_datatype)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->default_datatype)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->default_datatype)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->default_datatype)); > } > ndr->flags = _flags_save_string; > } >@@ -12282,8 +12376,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > uint32_t _flags_save_string_array = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->previous_names) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->previous_names)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->previous_names)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->previous_names)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->previous_names)); > } > ndr->flags = _flags_save_string_array; > } >@@ -12291,8 +12386,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->manufacturer_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->manufacturer_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->manufacturer_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->manufacturer_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->manufacturer_name)); > } > ndr->flags = _flags_save_string; > } >@@ -12300,8 +12396,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->manufacturer_url) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->manufacturer_url)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->manufacturer_url)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->manufacturer_url)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->manufacturer_url)); > } > ndr->flags = _flags_save_string; > } >@@ -12309,8 +12406,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->hardware_id) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->hardware_id)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->hardware_id)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->hardware_id)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->hardware_id)); > } > ndr->flags = _flags_save_string; > } >@@ -12318,8 +12416,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->provider) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->provider)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->provider)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->provider)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->provider)); > } > ndr->flags = _flags_save_string; > } >@@ -12877,8 +12976,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo7(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_name)); > } > ndr->flags = _flags_save_string; > } >@@ -12886,8 +12986,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo7(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->inf_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->inf_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->inf_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->inf_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->inf_name)); > } > ndr->flags = _flags_save_string; > } >@@ -12895,8 +12996,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo7(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->install_source_root) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->install_source_root)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->install_source_root)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->install_source_root)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->install_source_root)); > } > ndr->flags = _flags_save_string; > } >@@ -13167,8 +13269,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_name)); > } > ndr->flags = _flags_save_string; > } >@@ -13176,8 +13279,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->architecture) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->architecture)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->architecture)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->architecture)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->architecture)); > } > ndr->flags = _flags_save_string; > } >@@ -13185,8 +13289,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_path) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_path)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_path)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_path)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_path)); > } > ndr->flags = _flags_save_string; > } >@@ -13194,8 +13299,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->data_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->data_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->data_file)); > } > ndr->flags = _flags_save_string; > } >@@ -13203,8 +13309,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->config_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->config_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->config_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->config_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->config_file)); > } > ndr->flags = _flags_save_string; > } >@@ -13212,8 +13319,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->help_file) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->help_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->help_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->help_file)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->help_file)); > } > ndr->flags = _flags_save_string; > } >@@ -13221,8 +13329,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string_array = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->dependent_files) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->dependent_files)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dependent_files)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->dependent_files)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->dependent_files)); > } > ndr->flags = _flags_save_string_array; > } >@@ -13230,8 +13339,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->monitor_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->monitor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->monitor_name)); > } > ndr->flags = _flags_save_string; > } >@@ -13239,8 +13349,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->default_datatype) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->default_datatype)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->default_datatype)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->default_datatype)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->default_datatype)); > } > ndr->flags = _flags_save_string; > } >@@ -13248,8 +13359,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string_array = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->previous_names) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->previous_names)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->previous_names)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->previous_names)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->previous_names)); > } > ndr->flags = _flags_save_string_array; > } >@@ -13257,8 +13369,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->manufacturer_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->manufacturer_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->manufacturer_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->manufacturer_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->manufacturer_name)); > } > ndr->flags = _flags_save_string; > } >@@ -13266,8 +13379,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->manufacturer_url) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->manufacturer_url)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->manufacturer_url)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->manufacturer_url)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->manufacturer_url)); > } > ndr->flags = _flags_save_string; > } >@@ -13275,8 +13389,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->hardware_id) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->hardware_id)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->hardware_id)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->hardware_id)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->hardware_id)); > } > ndr->flags = _flags_save_string; > } >@@ -13284,8 +13399,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->provider) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->provider)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->provider)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->provider)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->provider)); > } > ndr->flags = _flags_save_string; > } >@@ -13293,8 +13409,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->print_processor) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->print_processor)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->print_processor)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->print_processor)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->print_processor)); > } > ndr->flags = _flags_save_string; > } >@@ -13302,8 +13419,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->vendor_setup) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->vendor_setup)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->vendor_setup)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->vendor_setup)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->vendor_setup)); > } > ndr->flags = _flags_save_string; > } >@@ -13311,8 +13429,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string_array = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->color_profiles) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->color_profiles)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->color_profiles)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->color_profiles)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->color_profiles)); > } > ndr->flags = _flags_save_string_array; > } >@@ -13320,8 +13439,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->inf_path) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->inf_path)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->inf_path)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->inf_path)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->inf_path)); > } > ndr->flags = _flags_save_string; > } >@@ -13329,8 +13449,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > uint32_t _flags_save_string_array = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->core_driver_dependencies) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->core_driver_dependencies)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->core_driver_dependencies)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->core_driver_dependencies)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->core_driver_dependencies)); > } > ndr->flags = _flags_save_string_array; > } >@@ -14085,8 +14206,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverFileInfo(struct ndr_push *ndr, > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->file_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->file_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->file_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->file_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->file_name)); > } > ndr->flags = _flags_save_string; > } >@@ -14680,8 +14802,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrintProcessorInfo1(struct ndr_push > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->print_processor_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->print_processor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->print_processor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->print_processor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->print_processor_name)); > } > ndr->flags = _flags_save_string; > } >@@ -15702,8 +15825,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo1(struct ndr_push *ndr, int > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->form_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->form_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->form_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->form_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->form_name)); > } > ndr->flags = _flags_save_string; > } >@@ -15841,8 +15965,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo2(struct ndr_push *ndr, int > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->form_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->form_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->form_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->form_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->form_name)); > } > ndr->flags = _flags_save_string; > } >@@ -15850,8 +15975,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo2(struct ndr_push *ndr, int > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM); > if (r->keyword) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->keyword)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->keyword)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->keyword)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->keyword)); > } > ndr->flags = _flags_save_string; > } >@@ -15859,8 +15985,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo2(struct ndr_push *ndr, int > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->mui_dll) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->mui_dll)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->mui_dll)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->mui_dll)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->mui_dll)); > } > ndr->flags = _flags_save_string; > } >@@ -15868,8 +15995,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo2(struct ndr_push *ndr, int > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->display_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->display_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->display_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->display_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->display_name)); > } > ndr->flags = _flags_save_string; > } >@@ -16571,8 +16699,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfo1(struct ndr_push *ndr, int > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->port_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->port_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->port_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->port_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->port_name)); > } > ndr->flags = _flags_save_string; > } >@@ -16694,8 +16823,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfo2(struct ndr_push *ndr, int > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->port_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->port_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->port_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->port_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->port_name)); > } > ndr->flags = _flags_save_string; > } >@@ -16703,8 +16833,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfo2(struct ndr_push *ndr, int > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->monitor_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->monitor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->monitor_name)); > } > ndr->flags = _flags_save_string; > } >@@ -16712,8 +16843,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfo2(struct ndr_push *ndr, int > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->description) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->description)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->description)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->description)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->description)); > } > ndr->flags = _flags_save_string; > } >@@ -16934,8 +17066,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfo3(struct ndr_push *ndr, int > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->status_string) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->status_string)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->status_string)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->status_string)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->status_string)); > } > ndr->flags = _flags_save_string; > } >@@ -17023,8 +17156,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfoFF(struct ndr_push *ndr, int > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->port_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->port_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->port_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->port_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->port_name)); > } > ndr->flags = _flags_save_string; > } >@@ -17267,8 +17401,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorInfo1(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->monitor_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->monitor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->monitor_name)); > } > ndr->flags = _flags_save_string; > } >@@ -17363,8 +17498,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorInfo2(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->monitor_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->monitor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->monitor_name)); > } > ndr->flags = _flags_save_string; > } >@@ -17372,8 +17508,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorInfo2(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->environment) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->environment)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->environment)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->environment)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->environment)); > } > ndr->flags = _flags_save_string; > } >@@ -17381,8 +17518,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorInfo2(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->dll_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->dll_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dll_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->dll_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->dll_name)); > } > ndr->flags = _flags_save_string; > } >@@ -17645,8 +17783,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrintProcDataTypesInfo1(struct ndr_p > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->name_array) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->name_array)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->name_array)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->name_array)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->name_array)); > } > ndr->flags = _flags_save_string; > } >@@ -19284,13 +19423,14 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterEnumValues(struct ndr_push *n > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->value_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->value_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->value_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->value_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->value_name)); > } > ndr->flags = _flags_save_string; > } > if (r->data) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->data)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data)); > { > struct ndr_push *_ndr_data; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_data, 0, r->data_length)); >@@ -19298,6 +19438,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterEnumValues(struct ndr_push *n > NDR_CHECK(ndr_push_spoolss_PrinterData(_ndr_data, NDR_SCALARS|NDR_BUFFERS, r->data)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_data, 0, r->data_length)); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->data)); > } > } > ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset); >diff --git a/librpc/gen_ndr/ndr_svcctl.c b/librpc/gen_ndr/ndr_svcctl.c >index 4a81cc6..a1cb7c7 100644 >--- a/librpc/gen_ndr/ndr_svcctl.c >+++ b/librpc/gen_ndr/ndr_svcctl.c >@@ -244,8 +244,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_ENUM_SERVICE_STATUSW(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->service_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->service_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->service_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->service_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->service_name)); > } > ndr->flags = _flags_save_string; > } >@@ -253,8 +254,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_ENUM_SERVICE_STATUSW(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->display_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->display_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->display_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->display_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->display_name)); > } > ndr->flags = _flags_save_string; > } >@@ -381,8 +383,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_ENUM_SERVICE_STATUSA(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM); > if (r->service_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->service_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->service_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->service_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->service_name)); > } > ndr->flags = _flags_save_string; > } >@@ -390,8 +393,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_ENUM_SERVICE_STATUSA(struct ndr_push *ndr, i > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM); > if (r->display_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->display_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->display_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->display_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->display_name)); > } > ndr->flags = _flags_save_string; > } >@@ -1023,8 +1027,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_SERVICE_DESCRIPTION(struct ndr_push *ndr, in > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->description) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->description)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->description)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->description)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->description)); > } > ndr->flags = _flags_save_string; > } >@@ -1179,8 +1184,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_SERVICE_FAILURE_ACTIONS(struct ndr_push *ndr > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->rebootmsg) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->rebootmsg)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->rebootmsg)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->rebootmsg)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->rebootmsg)); > } > ndr->flags = _flags_save_string; > } >@@ -1188,17 +1194,19 @@ _PUBLIC_ enum ndr_err_code ndr_push_SERVICE_FAILURE_ACTIONS(struct ndr_push *ndr > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->command) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->command)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->command)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->command)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->command)); > } > ndr->flags = _flags_save_string; > } > if (r->actions) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->actions)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->actions)); > NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->num_actions)); > for (cntr_actions_1 = 0; cntr_actions_1 < r->num_actions; cntr_actions_1++) { > NDR_CHECK(ndr_push_SC_ACTION(ndr, NDR_SCALARS, &r->actions[cntr_actions_1])); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->actions)); > } > } > return NDR_ERR_SUCCESS; >-- >1.6.6 > > >From 796fbbedbba6a561c74f619052167e9d4b16453b Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Thu, 11 Feb 2010 18:54:31 +0100 >Subject: [PATCH 04/24] spoolss: fix relative pointers in ndr_push_spoolss_DriverInfo101. > >Guenther >(cherry picked from commit bfd6edb3e9339d602eb6514ff50c3bb6c671174e) >--- > librpc/ndr/ndr_spoolss_buf.c | 30 ++++++++++++++++++++---------- > 1 files changed, 20 insertions(+), 10 deletions(-) > >diff --git a/librpc/ndr/ndr_spoolss_buf.c b/librpc/ndr/ndr_spoolss_buf.c >index b8d6f83..7d9c211 100644 >--- a/librpc/ndr/ndr_spoolss_buf.c >+++ b/librpc/ndr/ndr_spoolss_buf.c >@@ -928,8 +928,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo101(struct ndr_push *ndr, > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->driver_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->driver_name)); > } > ndr->flags = _flags_save_string; > } >@@ -937,13 +938,14 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo101(struct ndr_push *ndr, > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->architecture) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->architecture)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->architecture)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->architecture)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->architecture)); > } > ndr->flags = _flags_save_string; > } > if (r->file_info) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->file_info)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->file_info)); > #if 0 > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->file_count)); > #endif >@@ -953,13 +955,15 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo101(struct ndr_push *ndr, > for (cntr_file_info_1 = 0; cntr_file_info_1 < r->file_count; cntr_file_info_1++) { > NDR_CHECK(ndr_push_spoolss_DriverFileInfo(ndr, NDR_BUFFERS, &r->file_info[cntr_file_info_1])); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->file_info)); > } > { > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->monitor_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->monitor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->monitor_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->monitor_name)); > } > ndr->flags = _flags_save_string; > } >@@ -967,8 +971,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo101(struct ndr_push *ndr, > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->default_datatype) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->default_datatype)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->default_datatype)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->default_datatype)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->default_datatype)); > } > ndr->flags = _flags_save_string; > } >@@ -976,8 +981,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo101(struct ndr_push *ndr, > uint32_t _flags_save_string_array = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->previous_names) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->previous_names)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->previous_names)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->previous_names)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->previous_names)); > } > ndr->flags = _flags_save_string_array; > } >@@ -985,8 +991,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo101(struct ndr_push *ndr, > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->manufacturer_name) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->manufacturer_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->manufacturer_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->manufacturer_name)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->manufacturer_name)); > } > ndr->flags = _flags_save_string; > } >@@ -994,8 +1001,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo101(struct ndr_push *ndr, > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->manufacturer_url) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->manufacturer_url)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->manufacturer_url)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->manufacturer_url)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->manufacturer_url)); > } > ndr->flags = _flags_save_string; > } >@@ -1003,8 +1011,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo101(struct ndr_push *ndr, > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->hardware_id) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->hardware_id)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->hardware_id)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->hardware_id)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->hardware_id)); > } > ndr->flags = _flags_save_string; > } >@@ -1012,8 +1021,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo101(struct ndr_push *ndr, > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > if (r->provider) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->provider)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->provider)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->provider)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->provider)); > } > ndr->flags = _flags_save_string; > } >-- >1.6.6 > > >From 70e1c0e3cf290e879d3b1748e2806804ada2b7f4 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Wed, 17 Feb 2010 19:59:19 +0100 >Subject: [PATCH 05/24] librpc/ndr_drsblobs: use ndr_push_relative_ptr2_start()/_end() > >metze >(cherry picked from commit b423bd2115e006f9af5d40cf5b651e03739d53a0) >--- > librpc/ndr/ndr_drsblobs.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > >diff --git a/librpc/ndr/ndr_drsblobs.c b/librpc/ndr/ndr_drsblobs.c >index aecb0c3..0f7bd75 100644 >--- a/librpc/ndr/ndr_drsblobs.c >+++ b/librpc/ndr/ndr_drsblobs.c >@@ -96,12 +96,14 @@ _PUBLIC_ enum ndr_err_code ndr_push_trustAuthInOutBlob(struct ndr_push *ndr, int > } > if (ndr_flags & NDR_BUFFERS) { > if (r->current) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->current)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->current)); > NDR_CHECK(ndr_push_AuthenticationInformationArray_with_count(ndr, NDR_SCALARS|NDR_BUFFERS, r->count, r->current)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->current)); > } > if (r->previous) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->previous)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->previous)); > NDR_CHECK(ndr_push_AuthenticationInformationArray_with_count(ndr, NDR_SCALARS|NDR_BUFFERS, r->count, r->previous)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->previous)); > } > } > return NDR_ERR_SUCCESS; >-- >1.6.6 > > >From 385bdb820754ac42e3215f4ebd99e59a0ca694b1 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Wed, 17 Feb 2010 20:00:04 +0100 >Subject: [PATCH 06/24] librpc/ndr_krb5pac: use ndr_push_relative_ptr2_start()/_end() > >metze >(cherry picked from commit e03591111a1b9c2f05c29a7afac4641f23f455f4) >--- > librpc/ndr/ndr_krb5pac.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > >diff --git a/librpc/ndr/ndr_krb5pac.c b/librpc/ndr/ndr_krb5pac.c >index f6654f7..34a2ef8 100644 >--- a/librpc/ndr/ndr_krb5pac.c >+++ b/librpc/ndr/ndr_krb5pac.c >@@ -59,7 +59,7 @@ enum ndr_err_code ndr_push_PAC_BUFFER(struct ndr_push *ndr, int ndr_flags, const > uint32_t _flags_save_PAC_INFO = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN8); > if (r->info) { >- NDR_CHECK(ndr_push_relative_ptr2(ndr, r->info)); >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->info)); > { > struct ndr_push *_ndr_info; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_info, 0, _subcontext_size_PAC_INFO(r->info,r->type,ndr->iconv_convenience, 0))); >@@ -67,6 +67,7 @@ enum ndr_err_code ndr_push_PAC_BUFFER(struct ndr_push *ndr, int ndr_flags, const > NDR_CHECK(ndr_push_PAC_INFO(_ndr_info, NDR_SCALARS|NDR_BUFFERS, r->info)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_info, 0, _subcontext_size_PAC_INFO(r->info,r->type,ndr->iconv_convenience,0))); > } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->info)); > } > ndr->flags = _flags_save_PAC_INFO; > } >-- >1.6.6 > > >From 52b0b57c1db74686ca0e1b6bd70815ecc7e32e69 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Wed, 17 Feb 2010 20:00:36 +0100 >Subject: [PATCH 07/24] librpc/ndr: make ndr_push_relative_ptr2() static > >metze >--- > librpc/ndr/libndr.h | 1 - > librpc/ndr/ndr.c | 2 +- > 2 files changed, 1 insertions(+), 2 deletions(-) > >diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h >index febac24..a209ddf 100644 >--- a/librpc/ndr/libndr.h >+++ b/librpc/ndr/libndr.h >@@ -382,7 +382,6 @@ void ndr_push_restore_relative_base_offset(struct ndr_push *ndr, uint32_t offset > enum ndr_err_code ndr_push_setup_relative_base_offset1(struct ndr_push *ndr, const void *p, uint32_t offset); > enum ndr_err_code ndr_push_setup_relative_base_offset2(struct ndr_push *ndr, const void *p); > enum ndr_err_code ndr_push_relative_ptr1(struct ndr_push *ndr, const void *p); >-enum ndr_err_code ndr_push_relative_ptr2(struct ndr_push *ndr, const void *p); > enum ndr_err_code ndr_push_relative_ptr2_start(struct ndr_push *ndr, const void *p); > enum ndr_err_code ndr_push_relative_ptr2_end(struct ndr_push *ndr, const void *p); > uint32_t ndr_pull_get_relative_base_offset(struct ndr_pull *ndr); >diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c >index ad77942..400045f 100644 >--- a/librpc/ndr/ndr.c >+++ b/librpc/ndr/ndr.c >@@ -1062,7 +1062,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr1(struct ndr_push *ndr, const vo > push a relative object - stage2 > this is called during buffers processing > */ >-_PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2(struct ndr_push *ndr, const void *p) >+static enum ndr_err_code ndr_push_relative_ptr2(struct ndr_push *ndr, const void *p) > { > uint32_t save_offset; > uint32_t ptr_offset = 0xFFFFFFFF; >-- >1.6.6 > > >From fa6477f7e14ce04fbdd0ebb63df5d477c4bd84f1 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Wed, 16 Dec 2009 22:54:02 +0100 >Subject: [PATCH 08/24] libndr: change subcontext buffer allocation to allocate on subcontext_start. > >Guenther >(cherry picked from commit c9fa97b01774d767acfabaf1eec7a6aad1510440) >--- > librpc/ndr/ndr.c | 10 +++++++--- > 1 files changed, 7 insertions(+), 3 deletions(-) > >diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c >index 400045f..2df4063 100644 >--- a/librpc/ndr/ndr.c >+++ b/librpc/ndr/ndr.c >@@ -590,6 +590,11 @@ _PUBLIC_ enum ndr_err_code ndr_push_subcontext_start(struct ndr_push *ndr, > NDR_ERR_HAVE_NO_MEMORY(subndr); > subndr->flags = ndr->flags & ~LIBNDR_FLAG_NDR64; > >+ if (size_is > 0) { >+ NDR_CHECK(ndr_push_zero(subndr, size_is)); >+ subndr->offset = 0; >+ } >+ > *_subndr = subndr; > return NDR_ERR_SUCCESS; > } >@@ -606,12 +611,11 @@ _PUBLIC_ enum ndr_err_code ndr_push_subcontext_end(struct ndr_push *ndr, > > if (size_is >= 0) { > padding_len = size_is - subndr->offset; >- if (padding_len > 0) { >- NDR_CHECK(ndr_push_zero(subndr, padding_len)); >- } else if (padding_len < 0) { >+ if (padding_len < 0) { > return ndr_push_error(ndr, NDR_ERR_SUBCONTEXT, "Bad subcontext (PUSH) content_size %d is larger than size_is(%d)", > (int)subndr->offset, (int)size_is); > } >+ subndr->offset = size_is; > } > > switch (header_size) { >-- >1.6.6 > > >From 1ce28cb8b760fe42c31eebce742c6b727d52f262 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Mon, 14 Dec 2009 15:09:00 +0100 >Subject: [PATCH 09/24] libndr: add LIBNDR_FLAG_RELATIVE_REVERSE flag. > >Guenther >(cherry picked from commit ee13a51b0514ec3ac4ca9c532c2b101a08ec9784) >--- > librpc/idl/idl_types.h | 2 ++ > librpc/ndr/libndr.h | 2 ++ > 2 files changed, 4 insertions(+), 0 deletions(-) > >diff --git a/librpc/idl/idl_types.h b/librpc/idl/idl_types.h >index 9885ca5..193a1f6 100644 >--- a/librpc/idl/idl_types.h >+++ b/librpc/idl/idl_types.h >@@ -67,3 +67,5 @@ > this is used to control formatting of uint8 arrays > */ > #define NDR_PAHEX LIBNDR_PRINT_ARRAY_HEX >+ >+#define NDR_RELATIVE_REVERSE LIBNDR_FLAG_RELATIVE_REVERSE >diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h >index a209ddf..6312c40 100644 >--- a/librpc/ndr/libndr.h >+++ b/librpc/ndr/libndr.h >@@ -123,6 +123,8 @@ struct ndr_print { > #define LIBNDR_FLAG_STR_UTF8 (1<<12) > #define LIBNDR_STRING_FLAGS (0x7FFC) > >+/* set if relative pointers are marshalled in reverse order */ >+#define LIBNDR_FLAG_RELATIVE_REVERSE (1<<19) > > #define LIBNDR_FLAG_REF_ALLOC (1<<20) > #define LIBNDR_FLAG_REMAINING (1<<21) >-- >1.6.6 > > >From 91df5cdb2294abde7b5d535dc8af2cc00b85327e Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Tue, 9 Feb 2010 18:27:37 +0100 >Subject: [PATCH 10/24] libndr: add LIBNDR_FLAG_NO_RELATIVE_REVERSE so that relative reverse processing > can be disabled for single structure elements. > >Guenther >(cherry picked from commit a2c34296fa6ca2ffb69cb69698a9b5f81803e8a8) >--- > librpc/idl/idl_types.h | 1 + > librpc/ndr/libndr.h | 3 +++ > librpc/ndr/ndr.c | 3 +++ > 3 files changed, 7 insertions(+), 0 deletions(-) > >diff --git a/librpc/idl/idl_types.h b/librpc/idl/idl_types.h >index 193a1f6..3c6c12c 100644 >--- a/librpc/idl/idl_types.h >+++ b/librpc/idl/idl_types.h >@@ -69,3 +69,4 @@ > #define NDR_PAHEX LIBNDR_PRINT_ARRAY_HEX > > #define NDR_RELATIVE_REVERSE LIBNDR_FLAG_RELATIVE_REVERSE >+#define NDR_NO_RELATIVE_REVERSE LIBNDR_FLAG_NO_RELATIVE_REVERSE >diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h >index 6312c40..6274b20 100644 >--- a/librpc/ndr/libndr.h >+++ b/librpc/ndr/libndr.h >@@ -123,6 +123,9 @@ struct ndr_print { > #define LIBNDR_FLAG_STR_UTF8 (1<<12) > #define LIBNDR_STRING_FLAGS (0x7FFC) > >+/* set if relative pointers should *not* be marshalled in reverse order */ >+#define LIBNDR_FLAG_NO_RELATIVE_REVERSE (1<<18) >+ > /* set if relative pointers are marshalled in reverse order */ > #define LIBNDR_FLAG_RELATIVE_REVERSE (1<<19) > >diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c >index 2df4063..523d7e8 100644 >--- a/librpc/ndr/ndr.c >+++ b/librpc/ndr/ndr.c >@@ -367,6 +367,9 @@ _PUBLIC_ void ndr_set_flags(uint32_t *pflags, uint32_t new_flags) > if (new_flags & LIBNDR_ALIGN_FLAGS) { > (*pflags) &= ~LIBNDR_FLAG_REMAINING; > } >+ if (new_flags & LIBNDR_FLAG_NO_RELATIVE_REVERSE) { >+ (*pflags) &= ~LIBNDR_FLAG_RELATIVE_REVERSE; >+ } > (*pflags) |= new_flags; > } > >-- >1.6.6 > > >From 5bf2cc274b1c1e37f91e613eac1a6d5931960f0f Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Wed, 17 Feb 2010 20:27:08 +0100 >Subject: [PATCH 11/24] libndr: give an error when ndr_push_relative_ptr2_start()/_end() is used with the RELATIVE_REVERSE flag > >metze >(cherry picked from commit b5f9c44da55abb28222441a7e064a2a25891981f) >--- > librpc/ndr/ndr.c | 7 ++++++- > 1 files changed, 6 insertions(+), 1 deletions(-) > >diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c >index 523d7e8..5f4ce59 100644 >--- a/librpc/ndr/ndr.c >+++ b/librpc/ndr/ndr.c >@@ -1103,7 +1103,12 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_start(struct ndr_push *ndr, co > if (p == NULL) { > return NDR_ERR_SUCCESS; > } >- return ndr_push_relative_ptr2(ndr, p); >+ if (!(ndr->flags & LIBNDR_FLAG_RELATIVE_REVERSE)) { >+ return ndr_push_relative_ptr2(ndr, p); >+ } >+ >+ return ndr_push_error(ndr, NDR_ERR_RELATIVE, >+ "ndr_push_relative_ptr2_start RELATIVE_REVERSE flag set, but not supported"); > } > > /* >-- >1.6.6 > > >From c4d2515d949e848fcd893b50fe3a1db7888f93ee Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Mon, 14 Dec 2009 15:33:32 +0100 >Subject: [PATCH 12/24] libndr: store a subcontext buffer size in ndr_push_subcontext_start. > >Guenther >(cherry picked from commit 05347754ee61f06466d6d9b7f390001992f793ce) >--- > librpc/ndr/libndr.h | 1 + > librpc/ndr/ndr.c | 1 + > 2 files changed, 2 insertions(+), 0 deletions(-) > >diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h >index 6274b20..ca920ec 100644 >--- a/librpc/ndr/libndr.h >+++ b/librpc/ndr/libndr.h >@@ -85,6 +85,7 @@ struct ndr_push { > uint32_t offset; > > uint32_t relative_base_offset; >+ uint32_t relative_end_offset; > struct ndr_token_list *relative_base_list; > > struct ndr_token_list *switch_list; >diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c >index 5f4ce59..19620ac 100644 >--- a/librpc/ndr/ndr.c >+++ b/librpc/ndr/ndr.c >@@ -596,6 +596,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_subcontext_start(struct ndr_push *ndr, > if (size_is > 0) { > NDR_CHECK(ndr_push_zero(subndr, size_is)); > subndr->offset = 0; >+ subndr->relative_end_offset = size_is; > } > > *_subndr = subndr; >-- >1.6.6 > > >From d76ff0bf49c66bd9a93daad78466a4ef92a2a777 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Wed, 17 Feb 2010 21:24:40 +0100 >Subject: [PATCH 13/24] libndr: implement LIBNDR_RELATIVE_REVERSE handling > >This is based on Guenther's initial code. > >metze >(cherry picked from commit 31c7780c16651b284009874cf3da04587dc36d19) >--- > librpc/ndr/libndr.h | 1 + > librpc/ndr/ndr.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++-- > 2 files changed, 87 insertions(+), 3 deletions(-) > >diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h >index ca920ec..ff7c912 100644 >--- a/librpc/ndr/libndr.h >+++ b/librpc/ndr/libndr.h >@@ -90,6 +90,7 @@ struct ndr_push { > > struct ndr_token_list *switch_list; > struct ndr_token_list *relative_list; >+ struct ndr_token_list *relative_begin_list; > struct ndr_token_list *nbt_string_list; > struct ndr_token_list *full_ptr_list; > >diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c >index 19620ac..c5c6804 100644 >--- a/librpc/ndr/ndr.c >+++ b/librpc/ndr/ndr.c >@@ -1107,9 +1107,13 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_start(struct ndr_push *ndr, co > if (!(ndr->flags & LIBNDR_FLAG_RELATIVE_REVERSE)) { > return ndr_push_relative_ptr2(ndr, p); > } >- >- return ndr_push_error(ndr, NDR_ERR_RELATIVE, >- "ndr_push_relative_ptr2_start RELATIVE_REVERSE flag set, but not supported"); >+ if (ndr->relative_end_offset == -1) { >+ return ndr_push_error(ndr, NDR_ERR_RELATIVE, >+ "ndr_push_relative_ptr2_start RELATIVE_REVERSE flag set and relative_end_offset %d", >+ ndr->relative_end_offset); >+ } >+ NDR_CHECK(ndr_token_store(ndr, &ndr->relative_begin_list, p, ndr->offset)); >+ return NDR_ERR_SUCCESS; > } > > /* >@@ -1118,9 +1122,88 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_start(struct ndr_push *ndr, co > */ > _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_end(struct ndr_push *ndr, const void *p) > { >+ uint32_t begin_offset = 0xFFFFFFFF; >+ ssize_t len; >+ uint32_t correct_offset = 0; >+ uint32_t align = 1; >+ uint32_t pad = 0; >+ > if (p == NULL) { > return NDR_ERR_SUCCESS; > } >+ >+ if (!(ndr->flags & LIBNDR_FLAG_RELATIVE_REVERSE)) { >+ return NDR_ERR_SUCCESS; >+ } >+ >+ if (ndr->relative_end_offset < ndr->offset) { >+ return ndr_push_error(ndr, NDR_ERR_RELATIVE, >+ "ndr_push_relative_ptr2_end:" >+ "relative_end_offset %u < offset %u", >+ ndr->relative_end_offset, ndr->offset); >+ } >+ >+ NDR_CHECK(ndr_token_retrieve(&ndr->relative_begin_list, p, &begin_offset)); >+ >+ /* we have marshalled a buffer, see how long it was */ >+ len = ndr->offset - begin_offset; >+ >+ if (len < 0) { >+ return ndr_push_error(ndr, NDR_ERR_RELATIVE, >+ "ndr_push_relative_ptr2_end:" >+ "offset %u - begin_offset %u < 0", >+ ndr->offset, begin_offset); >+ } >+ >+ if (ndr->relative_end_offset < len) { >+ return ndr_push_error(ndr, NDR_ERR_RELATIVE, >+ "ndr_push_relative_ptr2_end:" >+ "relative_end_offset %u < len %lld", >+ ndr->offset, (long long)len); >+ } >+ >+ /* the reversed offset is at the end of the main buffer */ >+ correct_offset = ndr->relative_end_offset - len; >+ >+ if (ndr->flags & LIBNDR_FLAG_ALIGN2) { >+ align = 2; >+ } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) { >+ align = 4; >+ } else if (ndr->flags & LIBNDR_FLAG_ALIGN8) { >+ align = 8; >+ } >+ >+ pad = ndr_align_size(correct_offset, align); >+ if (pad) { >+ correct_offset += pad; >+ correct_offset -= align; >+ } >+ >+ if (correct_offset < begin_offset) { >+ return ndr_push_error(ndr, NDR_ERR_RELATIVE, >+ "ndr_push_relative_ptr2_end: " >+ "correct_offset %u < begin_offset %u", >+ correct_offset, begin_offset); >+ } >+ >+ if (len > 0) { >+ /* now move the marshalled buffer to the end of the main buffer */ >+ memmove(ndr->data + correct_offset, ndr->data + begin_offset, len); >+ >+ /* and wipe out old buffer within the main buffer */ >+ memset(ndr->data + begin_offset, '\0', len); >+ } >+ >+ /* and set the end offset for the next buffer */ >+ ndr->relative_end_offset = correct_offset; >+ >+ /* finally write the offset to the main buffer */ >+ ndr->offset = correct_offset; >+ NDR_CHECK(ndr_push_relative_ptr2(ndr, p)); >+ >+ /* restore to where we were in the main buffer */ >+ ndr->offset = begin_offset; >+ > return NDR_ERR_SUCCESS; > } > >-- >1.6.6 > > >From 7dab1af14b708769dd5ddce754c1b5f5ea0946d1 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Thu, 18 Feb 2010 13:40:44 +0100 >Subject: [PATCH 14/24] libndr: for now align reverse relative pointers to 2 bytes by default. > >This is just a hack and we should let the callers use FLAG_ALIGN2 >explicit in future. > >metze >(cherry picked from commit 4a76d29374769ba4c075b8d5767498848d2e17d6) >--- > librpc/ndr/ndr.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > >diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c >index c5c6804..da02682 100644 >--- a/librpc/ndr/ndr.c >+++ b/librpc/ndr/ndr.c >@@ -1165,6 +1165,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_end(struct ndr_push *ndr, cons > /* the reversed offset is at the end of the main buffer */ > correct_offset = ndr->relative_end_offset - len; > >+ /* TODO: remove this hack and let the idl use FLAG_ALIGN2 explicit */ >+ align = 2; >+ > if (ndr->flags & LIBNDR_FLAG_ALIGN2) { > align = 2; > } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) { >-- >1.6.6 > > >From 6076940730ce4e85ad92a30071c656b9dd33d8cc Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Thu, 18 Feb 2010 15:13:20 +0100 >Subject: [PATCH 15/24] libndr: fix ndr_size_* calculation with relative reverse buffers > >metze >(cherry picked from commit 8310f02414efd3b792857ed20c636c4c114e1ba2) >--- > librpc/ndr/ndr.c | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > >diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c >index da02682..bece6b9 100644 >--- a/librpc/ndr/ndr.c >+++ b/librpc/ndr/ndr.c >@@ -1136,6 +1136,12 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_end(struct ndr_push *ndr, cons > return NDR_ERR_SUCCESS; > } > >+ if (ndr->flags & LIBNDR_FLAG_NO_NDR_SIZE) { >+ /* better say more than calculation a too small buffer */ >+ NDR_PUSH_ALIGN(ndr, 8); >+ return NDR_ERR_SUCCESS; >+ } >+ > if (ndr->relative_end_offset < ndr->offset) { > return ndr_push_error(ndr, NDR_ERR_RELATIVE, > "ndr_push_relative_ptr2_end:" >-- >1.6.6 > > >From 4616c0042bebb73518077c4562c4c276a5e41463 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Wed, 23 Dec 2009 15:52:39 +0100 >Subject: [PATCH 16/24] spoolss: use subcontext in NDR_SPOOLSS_PUSH_ENUM_OUT macro. > >metze >(cherry picked from commit a4c3aeb79306190b09e284a6a28e3b40fbc5823b) >--- > librpc/ndr/ndr_spoolss_buf.c | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > >diff --git a/librpc/ndr/ndr_spoolss_buf.c b/librpc/ndr/ndr_spoolss_buf.c >index 7d9c211..783f20b 100644 >--- a/librpc/ndr/ndr_spoolss_buf.c >+++ b/librpc/ndr/ndr_spoolss_buf.c >@@ -63,11 +63,14 @@ > NDR_ERR_HAVE_NO_MEMORY(_ndr_info);\ > _ndr_info->flags= ndr->flags;\ > if (r->out.info) {\ >+ struct ndr_push *_subndr_info;\ > struct __##fn __r;\ > __r.in.level = r->in.level;\ > __r.in.count = *r->out.count;\ > __r.out.info = *r->out.info;\ >- NDR_CHECK(ndr_push___##fn(_ndr_info, flags, &__r)); \ >+ NDR_CHECK(ndr_push_subcontext_start(_ndr_info, &_subndr_info, 0, r->in.offered));\ >+ NDR_CHECK(ndr_push___##fn(_subndr_info, flags, &__r)); \ >+ NDR_CHECK(ndr_push_subcontext_end(_ndr_info, _subndr_info, 0, r->in.offered));\ > }\ > if (r->in.offered > _ndr_info->offset) {\ > uint32_t _padding_len = r->in.offered - _ndr_info->offset;\ >-- >1.6.6 > > >From ee0fd1b8ce998497240ab981cda4be9eb61b69cf Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Thu, 18 Feb 2010 15:17:42 +0100 >Subject: [PATCH 17/24] ndr_spoolss_buf: use LIBNDR_FLAG_NO_NDR_SIZE in NDR_SPOOLSS_SIZE_* > >metze >(cherry picked from commit 2059a165ee6f4d231aa4075d8ddea70b8df8944f) >--- > librpc/ndr/ndr_spoolss_buf.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > >diff --git a/librpc/ndr/ndr_spoolss_buf.c b/librpc/ndr/ndr_spoolss_buf.c >index 783f20b..e6c0acf 100644 >--- a/librpc/ndr/ndr_spoolss_buf.c >+++ b/librpc/ndr/ndr_spoolss_buf.c >@@ -182,7 +182,7 @@ > DATA_BLOB _data_blob_info;\ > struct ndr_push *_ndr_info = ndr_push_init_ctx(mem_ctx, iconv_convenience);\ > if (!_ndr_info) return 0;\ >- _ndr_info->flags|=0;\ >+ _ndr_info->flags|=LIBNDR_FLAG_NO_NDR_SIZE;\ > __r.in.level = level;\ > __r.in.count = count;\ > __r.out.info = info;\ >@@ -197,7 +197,7 @@ > DATA_BLOB _data_blob_info;\ > struct ndr_push *_ndr_info = ndr_push_init_ctx(mem_ctx, iconv_convenience);\ > if (!_ndr_info) return 0;\ >- _ndr_info->flags|=0;\ >+ _ndr_info->flags|=LIBNDR_FLAG_NO_NDR_SIZE;\ > __r.in.count = count;\ > __r.out.info = info;\ > _NDR_CHECK_UINT32(ndr_push___##fn(_ndr_info, NDR_OUT, &__r)); \ >-- >1.6.6 > > >From bbc5ea481ad3fd0578442fbf0915eb7154fd10c7 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Mon, 14 Dec 2009 17:22:39 +0100 >Subject: [PATCH 18/24] spoolss: set NDR_RELATIVE_REVERSE flag for various unions that have relative pointers. > >Guenther >(cherry picked from commit 6d0a39741dacd81e33b25a91fa28cdf983d10d84) >--- > librpc/idl/spoolss.idl | 20 ++++++++++---------- > 1 files changed, 10 insertions(+), 10 deletions(-) > >diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl >index 259ffd4..503c77e 100644 >--- a/librpc/idl/spoolss.idl >+++ b/librpc/idl/spoolss.idl >@@ -528,7 +528,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > [relative,subcontext(0)] spoolss_DeviceMode *devmode; > } spoolss_DeviceModeInfo; > >- typedef [nodiscriminant,relative_base,public,gensize] union { >+ typedef [nodiscriminant,relative_base,public,gensize,flag(NDR_RELATIVE_REVERSE)] union { > [case(0)] spoolss_PrinterInfo0 info0; > [case(1)] spoolss_PrinterInfo1 info1; > [case(2)] spoolss_PrinterInfo2 info2; >@@ -667,7 +667,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > uint32 size_high; > } spoolss_JobInfo4; > >- typedef [nodiscriminant,relative_base,public,gensize] union { >+ typedef [nodiscriminant,relative_base,public,gensize,flag(NDR_RELATIVE_REVERSE)] union { > [case(1)] spoolss_JobInfo1 info1; > [case(2)] spoolss_JobInfo2 info2; > [case(3)] spoolss_JobInfo3 info3; >@@ -1266,7 +1266,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > [relative] nstring *provider; > } spoolss_DriverInfo101; > >- typedef [nodiscriminant,relative_base,public,gensize] union { >+ typedef [nodiscriminant,relative_base,public,gensize,flag(NDR_RELATIVE_REVERSE)] union { > [case(1)] spoolss_DriverInfo1 info1; > [case(2)] spoolss_DriverInfo2 info2; > [case(3)] spoolss_DriverInfo3 info3; >@@ -1328,7 +1328,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > /* NOTE: it's seems that w2k3 completly ignores the level > in its server code > */ >- typedef [nodiscriminant,relative_base,gensize,public] union { >+ typedef [nodiscriminant,relative_base,public,gensize,flag(NDR_RELATIVE_REVERSE)] union { > [case(1)] spoolss_DriverDirectoryInfo1 info1; > [default] spoolss_DriverDirectoryInfo1 info1; > } spoolss_DriverDirectoryInfo; >@@ -1366,7 +1366,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > [relative] nstring *print_processor_name; > } spoolss_PrintProcessorInfo1; > >- typedef [nodiscriminant,relative_base,public] union { >+ typedef [nodiscriminant,relative_base,public,flag(NDR_RELATIVE_REVERSE)] union { > [case(1)] spoolss_PrintProcessorInfo1 info1; > [default]; > } spoolss_PrintProcessorInfo; >@@ -1403,7 +1403,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > nstring directory_name; > } spoolss_PrintProcessorDirectoryInfo1; > >- typedef [nodiscriminant,relative_base,gensize,public] union { >+ typedef [nodiscriminant,relative_base,public,gensize,flag(NDR_RELATIVE_REVERSE)] union { > [case(1)] spoolss_PrintProcessorDirectoryInfo1 info1; > [default] spoolss_PrintProcessorDirectoryInfo1 info1; > } spoolss_PrintProcessorDirectoryInfo; >@@ -1718,7 +1718,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > uint16 unused; > } spoolss_FormInfo2; > >- typedef [nodiscriminant,relative_base,public,gensize] union { >+ typedef [nodiscriminant,relative_base,public,gensize,flag(NDR_RELATIVE_REVERSE)] union { > [case(1)] spoolss_FormInfo1 info1; > [case(2)] spoolss_FormInfo2 info2; > [default]; >@@ -1871,7 +1871,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > DATA_BLOB monitor_data; /* relative ?? */ > } spoolss_PortInfoFF; > >- typedef [nodiscriminant,relative_base,public] union { >+ typedef [nodiscriminant,relative_base,public,flag(NDR_RELATIVE_REVERSE)] union { > [case(1)] spoolss_PortInfo1 info1; > [case(2)] spoolss_PortInfo2 info2; > [case(3)] spoolss_PortInfo3 info3; >@@ -1917,7 +1917,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > [relative] nstring *dll_name; > } spoolss_MonitorInfo2; > >- typedef [nodiscriminant,relative_base,public] union { >+ typedef [nodiscriminant,relative_base,public,flag(NDR_RELATIVE_REVERSE)] union { > [case(1)] spoolss_MonitorInfo1 info1; > [case(2)] spoolss_MonitorInfo2 info2; > [default]; >@@ -2033,7 +2033,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > [relative] nstring *name_array; > } spoolss_PrintProcDataTypesInfo1; > >- typedef [nodiscriminant,relative_base,public] union { >+ typedef [nodiscriminant,relative_base,public,flag(NDR_RELATIVE_REVERSE)] union { > [case(1)] spoolss_PrintProcDataTypesInfo1 info1; > [default]; > } spoolss_PrintProcDataTypesInfo; >-- >1.6.6 > > >From 7e4373fe954eae52a82e77df9f01d6814d95dc46 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Thu, 18 Feb 2010 15:36:08 +0100 >Subject: [PATCH 19/24] spoolss: make all security descriptors and devicemodes 4 byte aligned and add missing subcontexts. > >Guenther >(cherry picked from commit 8f52957369bf8ce7591d5d9a1436ccb7e384c612) >--- > librpc/idl/spoolss.idl | 16 ++++++++-------- > 1 files changed, 8 insertions(+), 8 deletions(-) > >diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl >index 503c77e..da89077 100644 >--- a/librpc/idl/spoolss.idl >+++ b/librpc/idl/spoolss.idl >@@ -473,12 +473,12 @@ import "misc.idl", "security.idl", "winreg.idl"; > [relative] nstring *drivername; > [relative] nstring *comment; > [relative] nstring *location; >- [relative,subcontext(0)] spoolss_DeviceMode *devmode; >+ [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode; > [relative] nstring *sepfile; > [relative] nstring *printprocessor; > [relative] nstring *datatype; > [relative] nstring *parameters; >- [relative,subcontext(0)] security_descriptor *secdesc; >+ [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; > spoolss_PrinterAttributes attributes; > [range(0,99)] uint32 priority; > uint32 defaultpriority; >@@ -490,7 +490,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > } spoolss_PrinterInfo2; > > typedef [public,gensize] struct { >- [relative,subcontext(0)] security_descriptor *secdesc; >+ [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; > } spoolss_PrinterInfo3; > > typedef [public,gensize] struct { >@@ -525,7 +525,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > } spoolss_PrinterInfo7; > > typedef struct { >- [relative,subcontext(0)] spoolss_DeviceMode *devmode; >+ [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode; > } spoolss_DeviceModeInfo; > > typedef [nodiscriminant,relative_base,public,gensize,flag(NDR_RELATIVE_REVERSE)] union { >@@ -619,9 +619,9 @@ import "misc.idl", "security.idl", "winreg.idl"; > [relative] nstring *print_processor; > [relative] nstring *parameters; > [relative] nstring *driver_name; >- [relative] spoolss_DeviceMode *devmode; >+ [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode; > [relative] nstring *text_status; >- [relative] security_descriptor *secdesc; >+ [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; > spoolss_JobStatus status; > [range(0,99)] uint32 priority; > uint32 position; >@@ -651,9 +651,9 @@ import "misc.idl", "security.idl", "winreg.idl"; > [relative] nstring *print_processor; > [relative] nstring *parameters; > [relative] nstring *driver_name; >- [relative] spoolss_DeviceMode *devmode; >+ [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode; > [relative] nstring *text_status; >- [relative] security_descriptor *secdesc; >+ [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; > spoolss_JobStatus status; > [range(0,99)] uint32 priority; > uint32 position; >-- >1.6.6 > > >From 9f258c63e135008b43c58a6f7ede2c83969d8358 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Sat, 13 Feb 2010 04:27:05 +0100 >Subject: [PATCH 20/24] spoolss: make two bitmaps public. > >Guenther >(cherry picked from commit 8c4ff98ea11ff06e20bea73596e9643d8194a890) >--- > librpc/idl/spoolss.idl | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > >diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl >index da89077..3365ea3 100644 >--- a/librpc/idl/spoolss.idl >+++ b/librpc/idl/spoolss.idl >@@ -68,7 +68,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > > const int PRINTER_STATUS_OK = 0x00000000; > >- typedef bitmap { >+ typedef [public] bitmap { > PRINTER_STATUS_PAUSED = 0x00000001, > PRINTER_STATUS_ERROR = 0x00000002, > PRINTER_STATUS_PENDING_DELETION = 0x00000004, >@@ -439,7 +439,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > PRINTER_ENUM_ICON7 | > PRINTER_ENUM_ICON8); /* 0x00ff0000 */ > >- typedef bitmap { >+ typedef [public] bitmap { > PRINTER_ATTRIBUTE_QUEUED = 0x00000001, > PRINTER_ATTRIBUTE_DIRECT = 0x00000002, > PRINTER_ATTRIBUTE_DEFAULT = 0x00000004, >-- >1.6.6 > > >From 660fca10240b453f4a2281abd39708982265fcdc Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Tue, 16 Feb 2010 10:46:07 +0100 >Subject: [PATCH 21/24] security: make two bitmaps public. > >Guenther >(cherry picked from commit f10a2d773d141f67319e19b45c40101bb9cb6cf4) >--- > librpc/idl/security.idl | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > >diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl >index c24dc64..44a1712 100644 >--- a/librpc/idl/security.idl >+++ b/librpc/idl/security.idl >@@ -392,14 +392,14 @@ interface security > } security_acl; > > /* default revision for new ACLs */ >- typedef [enum8bit] enum { >+ typedef [public,enum8bit] enum { > SECURITY_DESCRIPTOR_REVISION_1 = 1 > } security_descriptor_revision; > > const int SD_REVISION = SECURITY_DESCRIPTOR_REVISION_1; > > /* security_descriptor->type bits */ >- typedef [bitmap16bit] bitmap { >+ typedef [public,bitmap16bit] bitmap { > SEC_DESC_OWNER_DEFAULTED = 0x0001, > SEC_DESC_GROUP_DEFAULTED = 0x0002, > SEC_DESC_DACL_PRESENT = 0x0004, >-- >1.6.6 > > >From 7ae2c2b85c9c54eab47345fac28627e1e79280a0 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Tue, 9 Feb 2010 16:47:32 +0100 >Subject: [PATCH 22/24] s3: re-run make samba3-idl. > >Guenther >--- > librpc/gen_ndr/ndr_security.c | 8 +- > librpc/gen_ndr/ndr_security.h | 4 + > librpc/gen_ndr/ndr_spoolss.c | 2798 +++++++++++++++++++++++------------------ > librpc/gen_ndr/ndr_spoolss.h | 4 + > librpc/gen_ndr/spoolss.h | 36 +- > 5 files changed, 1607 insertions(+), 1243 deletions(-) > >diff --git a/librpc/gen_ndr/ndr_security.c b/librpc/gen_ndr/ndr_security.c >index 8ceb430..ceeba76 100644 >--- a/librpc/gen_ndr/ndr_security.c >+++ b/librpc/gen_ndr/ndr_security.c >@@ -552,13 +552,13 @@ _PUBLIC_ void ndr_print_security_acl(struct ndr_print *ndr, const char *name, co > ndr->depth--; > } > >-static enum ndr_err_code ndr_push_security_descriptor_revision(struct ndr_push *ndr, int ndr_flags, enum security_descriptor_revision r) >+_PUBLIC_ enum ndr_err_code ndr_push_security_descriptor_revision(struct ndr_push *ndr, int ndr_flags, enum security_descriptor_revision r) > { > NDR_CHECK(ndr_push_enum_uint8(ndr, NDR_SCALARS, r)); > return NDR_ERR_SUCCESS; > } > >-static enum ndr_err_code ndr_pull_security_descriptor_revision(struct ndr_pull *ndr, int ndr_flags, enum security_descriptor_revision *r) >+_PUBLIC_ enum ndr_err_code ndr_pull_security_descriptor_revision(struct ndr_pull *ndr, int ndr_flags, enum security_descriptor_revision *r) > { > uint8_t v; > NDR_CHECK(ndr_pull_enum_uint8(ndr, NDR_SCALARS, &v)); >@@ -576,13 +576,13 @@ _PUBLIC_ void ndr_print_security_descriptor_revision(struct ndr_print *ndr, cons > ndr_print_enum(ndr, name, "ENUM", val, r); > } > >-static enum ndr_err_code ndr_push_security_descriptor_type(struct ndr_push *ndr, int ndr_flags, uint16_t r) >+_PUBLIC_ enum ndr_err_code ndr_push_security_descriptor_type(struct ndr_push *ndr, int ndr_flags, uint16_t r) > { > NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r)); > return NDR_ERR_SUCCESS; > } > >-static enum ndr_err_code ndr_pull_security_descriptor_type(struct ndr_pull *ndr, int ndr_flags, uint16_t *r) >+_PUBLIC_ enum ndr_err_code ndr_pull_security_descriptor_type(struct ndr_pull *ndr, int ndr_flags, uint16_t *r) > { > uint16_t v; > NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &v)); >diff --git a/librpc/gen_ndr/ndr_security.h b/librpc/gen_ndr/ndr_security.h >index b900d54..e1f943d 100644 >--- a/librpc/gen_ndr/ndr_security.h >+++ b/librpc/gen_ndr/ndr_security.h >@@ -33,7 +33,11 @@ enum ndr_err_code ndr_push_security_acl(struct ndr_push *ndr, int ndr_flags, con > enum ndr_err_code ndr_pull_security_acl(struct ndr_pull *ndr, int ndr_flags, struct security_acl *r); > void ndr_print_security_acl(struct ndr_print *ndr, const char *name, const struct security_acl *r); > size_t ndr_size_security_acl(const struct security_acl *r, struct smb_iconv_convenience *ic, int flags); >+enum ndr_err_code ndr_push_security_descriptor_revision(struct ndr_push *ndr, int ndr_flags, enum security_descriptor_revision r); >+enum ndr_err_code ndr_pull_security_descriptor_revision(struct ndr_pull *ndr, int ndr_flags, enum security_descriptor_revision *r); > void ndr_print_security_descriptor_revision(struct ndr_print *ndr, const char *name, enum security_descriptor_revision r); >+enum ndr_err_code ndr_push_security_descriptor_type(struct ndr_push *ndr, int ndr_flags, uint16_t r); >+enum ndr_err_code ndr_pull_security_descriptor_type(struct ndr_pull *ndr, int ndr_flags, uint16_t *r); > void ndr_print_security_descriptor_type(struct ndr_print *ndr, const char *name, uint16_t r); > enum ndr_err_code ndr_push_security_descriptor(struct ndr_push *ndr, int ndr_flags, const struct security_descriptor *r); > enum ndr_err_code ndr_pull_security_descriptor(struct ndr_pull *ndr, int ndr_flags, struct security_descriptor *r); >diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c >index d5eeead..dadb3e3 100644 >--- a/librpc/gen_ndr/ndr_spoolss.c >+++ b/librpc/gen_ndr/ndr_spoolss.c >@@ -228,13 +228,13 @@ _PUBLIC_ void ndr_print_spoolss_MinorVersion(struct ndr_print *ndr, const char * > ndr_print_enum(ndr, name, "ENUM", val, r); > } > >-static enum ndr_err_code ndr_push_spoolss_PrinterStatus(struct ndr_push *ndr, int ndr_flags, uint32_t r) >+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterStatus(struct ndr_push *ndr, int ndr_flags, uint32_t r) > { > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r)); > return NDR_ERR_SUCCESS; > } > >-static enum ndr_err_code ndr_pull_spoolss_PrinterStatus(struct ndr_pull *ndr, int ndr_flags, uint32_t *r) >+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterStatus(struct ndr_pull *ndr, int ndr_flags, uint32_t *r) > { > uint32_t v; > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v)); >@@ -1242,13 +1242,13 @@ _PUBLIC_ void ndr_print_spoolss_EnumPrinterFlags(struct ndr_print *ndr, const ch > ndr->depth--; > } > >-static enum ndr_err_code ndr_push_spoolss_PrinterAttributes(struct ndr_push *ndr, int ndr_flags, uint32_t r) >+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterAttributes(struct ndr_push *ndr, int ndr_flags, uint32_t r) > { > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r)); > return NDR_ERR_SUCCESS; > } > >-static enum ndr_err_code ndr_pull_spoolss_PrinterAttributes(struct ndr_pull *ndr, int ndr_flags, uint32_t *r) >+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterAttributes(struct ndr_pull *ndr, int ndr_flags, uint32_t *r) > { > uint32_t v; > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v)); >@@ -1515,7 +1515,12 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->location)); > ndr->flags = _flags_save_string; > } >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->devmode)); >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->devmode)); >+ ndr->flags = _flags_save_spoolss_DeviceMode; >+ } > { > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >@@ -1540,7 +1545,12 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->parameters)); > ndr->flags = _flags_save_string; > } >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); >+ ndr->flags = _flags_save_security_descriptor; >+ } > NDR_CHECK(ndr_push_spoolss_PrinterAttributes(ndr, NDR_SCALARS, r->attributes)); > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->priority)); > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->defaultpriority)); >@@ -1622,15 +1632,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > } > ndr->flags = _flags_save_string; > } >- if (r->devmode) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode)); >- { >- struct ndr_push *_ndr_devmode; >- NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_devmode, 0, -1)); >- NDR_CHECK(ndr_push_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); >- NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_devmode, 0, -1)); >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->devmode) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode)); >+ { >+ struct ndr_push *_ndr_devmode; >+ NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_devmode, 0, -1)); >+ NDR_CHECK(ndr_push_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); >+ NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_devmode, 0, -1)); >+ } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode)); > } >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode)); >+ ndr->flags = _flags_save_spoolss_DeviceMode; > } > { > uint32_t _flags_save_string = ndr->flags; >@@ -1672,15 +1687,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > } > ndr->flags = _flags_save_string; > } >- if (r->secdesc) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); >- { >- struct ndr_push *_ndr_secdesc; >- NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >- NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >- NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->secdesc) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); >+ { >+ struct ndr_push *_ndr_secdesc; >+ NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >+ NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); >+ } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); > } >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); >+ ndr->flags = _flags_save_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -1800,12 +1820,17 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > ndr->flags = _flags_save_string; > } >- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode)); >- if (_ptr_devmode) { >- NDR_PULL_ALLOC(ndr, r->devmode); >- NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode)); >- } else { >- r->devmode = NULL; >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode)); >+ if (_ptr_devmode) { >+ NDR_PULL_ALLOC(ndr, r->devmode); >+ NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode)); >+ } else { >+ r->devmode = NULL; >+ } >+ ndr->flags = _flags_save_spoolss_DeviceMode; > } > { > uint32_t _flags_save_string = ndr->flags; >@@ -1855,12 +1880,17 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > ndr->flags = _flags_save_string; > } >- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); >- if (_ptr_secdesc) { >- NDR_PULL_ALLOC(ndr, r->secdesc); >- NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc)); >- } else { >- r->secdesc = NULL; >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); >+ if (_ptr_secdesc) { >+ NDR_PULL_ALLOC(ndr, r->secdesc); >+ NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc)); >+ } else { >+ r->secdesc = NULL; >+ } >+ ndr->flags = _flags_save_security_descriptor; > } > NDR_CHECK(ndr_pull_spoolss_PrinterAttributes(ndr, NDR_SCALARS, &r->attributes)); > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->priority)); >@@ -1981,20 +2011,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > ndr->flags = _flags_save_string; > } >- if (r->devmode) { >- uint32_t _relative_save_offset; >- _relative_save_offset = ndr->offset; >- NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode)); >- _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr); >- NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0); >- { >- struct ndr_pull *_ndr_devmode; >- NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_devmode, 0, -1)); >- NDR_CHECK(ndr_pull_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); >- NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_devmode, 0, -1)); >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->devmode) { >+ uint32_t _relative_save_offset; >+ _relative_save_offset = ndr->offset; >+ NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode)); >+ _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr); >+ NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0); >+ { >+ struct ndr_pull *_ndr_devmode; >+ NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_devmode, 0, -1)); >+ NDR_CHECK(ndr_pull_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); >+ NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_devmode, 0, -1)); >+ } >+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0); >+ ndr->offset = _relative_save_offset; > } >- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0); >- ndr->offset = _relative_save_offset; >+ ndr->flags = _flags_save_spoolss_DeviceMode; > } > { > uint32_t _flags_save_string = ndr->flags; >@@ -2056,20 +2091,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > ndr->flags = _flags_save_string; > } >- if (r->secdesc) { >- uint32_t _relative_save_offset; >- _relative_save_offset = ndr->offset; >- NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc)); >- _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr); >- NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0); >- { >- struct ndr_pull *_ndr_secdesc; >- NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >- NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >- NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1)); >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->secdesc) { >+ uint32_t _relative_save_offset; >+ _relative_save_offset = ndr->offset; >+ NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc)); >+ _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr); >+ NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0); >+ { >+ struct ndr_pull *_ndr_secdesc; >+ NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >+ NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1)); >+ } >+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); >+ ndr->offset = _relative_save_offset; > } >- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); >- ndr->offset = _relative_save_offset; >+ ndr->flags = _flags_save_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -2177,19 +2217,29 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo3(struct ndr_push *ndr, i > { > if (ndr_flags & NDR_SCALARS) { > NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); >+ ndr->flags = _flags_save_security_descriptor; >+ } > NDR_CHECK(ndr_push_trailer_align(ndr, 5)); > } > if (ndr_flags & NDR_BUFFERS) { >- if (r->secdesc) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); >- { >- struct ndr_push *_ndr_secdesc; >- NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >- NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >- NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->secdesc) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); >+ { >+ struct ndr_push *_ndr_secdesc; >+ NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >+ NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); >+ } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); > } >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); >+ ndr->flags = _flags_save_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -2201,30 +2251,40 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo3(struct ndr_pull *ndr, i > TALLOC_CTX *_mem_save_secdesc_0; > if (ndr_flags & NDR_SCALARS) { > NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); >- if (_ptr_secdesc) { >- NDR_PULL_ALLOC(ndr, r->secdesc); >- NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc)); >- } else { >- r->secdesc = NULL; >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); >+ if (_ptr_secdesc) { >+ NDR_PULL_ALLOC(ndr, r->secdesc); >+ NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc)); >+ } else { >+ r->secdesc = NULL; >+ } >+ ndr->flags = _flags_save_security_descriptor; > } > NDR_CHECK(ndr_pull_trailer_align(ndr, 5)); > } > if (ndr_flags & NDR_BUFFERS) { >- if (r->secdesc) { >- uint32_t _relative_save_offset; >- _relative_save_offset = ndr->offset; >- NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc)); >- _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr); >- NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0); >- { >- struct ndr_pull *_ndr_secdesc; >- NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >- NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >- NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1)); >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->secdesc) { >+ uint32_t _relative_save_offset; >+ _relative_save_offset = ndr->offset; >+ NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc)); >+ _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr); >+ NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0); >+ { >+ struct ndr_pull *_ndr_secdesc; >+ NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >+ NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1)); >+ } >+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); >+ ndr->offset = _relative_save_offset; > } >- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); >- ndr->offset = _relative_save_offset; >+ ndr->flags = _flags_save_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -2687,19 +2747,29 @@ static enum ndr_err_code ndr_push_spoolss_DeviceModeInfo(struct ndr_push *ndr, i > { > if (ndr_flags & NDR_SCALARS) { > NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->devmode)); >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->devmode)); >+ ndr->flags = _flags_save_spoolss_DeviceMode; >+ } > NDR_CHECK(ndr_push_trailer_align(ndr, 5)); > } > if (ndr_flags & NDR_BUFFERS) { >- if (r->devmode) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode)); >- { >- struct ndr_push *_ndr_devmode; >- NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_devmode, 0, -1)); >- NDR_CHECK(ndr_push_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); >- NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_devmode, 0, -1)); >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->devmode) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode)); >+ { >+ struct ndr_push *_ndr_devmode; >+ NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_devmode, 0, -1)); >+ NDR_CHECK(ndr_push_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); >+ NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_devmode, 0, -1)); >+ } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode)); > } >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode)); >+ ndr->flags = _flags_save_spoolss_DeviceMode; > } > } > return NDR_ERR_SUCCESS; >@@ -2711,30 +2781,40 @@ static enum ndr_err_code ndr_pull_spoolss_DeviceModeInfo(struct ndr_pull *ndr, i > TALLOC_CTX *_mem_save_devmode_0; > if (ndr_flags & NDR_SCALARS) { > NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode)); >- if (_ptr_devmode) { >- NDR_PULL_ALLOC(ndr, r->devmode); >- NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode)); >- } else { >- r->devmode = NULL; >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode)); >+ if (_ptr_devmode) { >+ NDR_PULL_ALLOC(ndr, r->devmode); >+ NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode)); >+ } else { >+ r->devmode = NULL; >+ } >+ ndr->flags = _flags_save_spoolss_DeviceMode; > } > NDR_CHECK(ndr_pull_trailer_align(ndr, 5)); > } > if (ndr_flags & NDR_BUFFERS) { >- if (r->devmode) { >- uint32_t _relative_save_offset; >- _relative_save_offset = ndr->offset; >- NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode)); >- _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr); >- NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0); >- { >- struct ndr_pull *_ndr_devmode; >- NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_devmode, 0, -1)); >- NDR_CHECK(ndr_pull_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); >- NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_devmode, 0, -1)); >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->devmode) { >+ uint32_t _relative_save_offset; >+ _relative_save_offset = ndr->offset; >+ NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode)); >+ _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr); >+ NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0); >+ { >+ struct ndr_pull *_ndr_devmode; >+ NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_devmode, 0, -1)); >+ NDR_CHECK(ndr_pull_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); >+ NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_devmode, 0, -1)); >+ } >+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0); >+ ndr->offset = _relative_save_offset; > } >- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0); >- ndr->offset = _relative_save_offset; >+ ndr->flags = _flags_save_spoolss_DeviceMode; > } > } > return NDR_ERR_SUCCESS; >@@ -2756,122 +2836,127 @@ _PUBLIC_ void ndr_print_spoolss_DeviceModeInfo(struct ndr_print *ndr, const char > _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_PrinterInfo *r) > { > uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr); >- if (ndr_flags & NDR_SCALARS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_union_align(ndr, 5)); >- switch (level) { >- case 0: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PrinterInfo0(ndr, NDR_SCALARS, &r->info0)); >- break; } >- >- case 1: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PrinterInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >- >- case 2: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PrinterInfo2(ndr, NDR_SCALARS, &r->info2)); >- break; } >- >- case 3: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PrinterInfo3(ndr, NDR_SCALARS, &r->info3)); >- break; } >- >- case 4: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PrinterInfo4(ndr, NDR_SCALARS, &r->info4)); >- break; } >- >- case 5: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PrinterInfo5(ndr, NDR_SCALARS, &r->info5)); >- break; } >- >- case 6: { >- NDR_CHECK(ndr_push_align(ndr, 4)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PrinterInfo6(ndr, NDR_SCALARS, &r->info6)); >- break; } >- >- case 7: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PrinterInfo7(ndr, NDR_SCALARS, &r->info7)); >- break; } >- >- case 8: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info8)); >- break; } >- >- case 9: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info9)); >- break; } >- >- default: { >- break; } >- >- } >- } >- if (ndr_flags & NDR_BUFFERS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 0: >- NDR_CHECK(ndr_push_spoolss_PrinterInfo0(ndr, NDR_BUFFERS, &r->info0)); >- break; >- >- case 1: >- NDR_CHECK(ndr_push_spoolss_PrinterInfo1(ndr, NDR_BUFFERS, &r->info1)); >- break; >- >- case 2: >- NDR_CHECK(ndr_push_spoolss_PrinterInfo2(ndr, NDR_BUFFERS, &r->info2)); >- break; >- >- case 3: >- NDR_CHECK(ndr_push_spoolss_PrinterInfo3(ndr, NDR_BUFFERS, &r->info3)); >- break; >- >- case 4: >- NDR_CHECK(ndr_push_spoolss_PrinterInfo4(ndr, NDR_BUFFERS, &r->info4)); >- break; >- >- case 5: >- NDR_CHECK(ndr_push_spoolss_PrinterInfo5(ndr, NDR_BUFFERS, &r->info5)); >- break; >- >- case 6: >- break; >- >- case 7: >- NDR_CHECK(ndr_push_spoolss_PrinterInfo7(ndr, NDR_BUFFERS, &r->info7)); >- break; >- >- case 8: >- NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info8)); >- break; >- >- case 9: >- NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info9)); >- break; >- >- default: >- break; >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ if (ndr_flags & NDR_SCALARS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_union_align(ndr, 5)); >+ switch (level) { >+ case 0: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PrinterInfo0(ndr, NDR_SCALARS, &r->info0)); >+ break; } >+ >+ case 1: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PrinterInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } >+ >+ case 2: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PrinterInfo2(ndr, NDR_SCALARS, &r->info2)); >+ break; } >+ >+ case 3: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PrinterInfo3(ndr, NDR_SCALARS, &r->info3)); >+ break; } >+ >+ case 4: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PrinterInfo4(ndr, NDR_SCALARS, &r->info4)); >+ break; } >+ >+ case 5: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PrinterInfo5(ndr, NDR_SCALARS, &r->info5)); >+ break; } >+ >+ case 6: { >+ NDR_CHECK(ndr_push_align(ndr, 4)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PrinterInfo6(ndr, NDR_SCALARS, &r->info6)); >+ break; } >+ >+ case 7: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PrinterInfo7(ndr, NDR_SCALARS, &r->info7)); >+ break; } >+ >+ case 8: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info8)); >+ break; } >+ >+ case 9: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info9)); >+ break; } >+ >+ default: { >+ break; } >+ >+ } >+ } >+ if (ndr_flags & NDR_BUFFERS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 0: >+ NDR_CHECK(ndr_push_spoolss_PrinterInfo0(ndr, NDR_BUFFERS, &r->info0)); >+ break; >+ >+ case 1: >+ NDR_CHECK(ndr_push_spoolss_PrinterInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; >+ >+ case 2: >+ NDR_CHECK(ndr_push_spoolss_PrinterInfo2(ndr, NDR_BUFFERS, &r->info2)); >+ break; >+ >+ case 3: >+ NDR_CHECK(ndr_push_spoolss_PrinterInfo3(ndr, NDR_BUFFERS, &r->info3)); >+ break; >+ >+ case 4: >+ NDR_CHECK(ndr_push_spoolss_PrinterInfo4(ndr, NDR_BUFFERS, &r->info4)); >+ break; >+ >+ case 5: >+ NDR_CHECK(ndr_push_spoolss_PrinterInfo5(ndr, NDR_BUFFERS, &r->info5)); >+ break; >+ >+ case 6: >+ break; >+ >+ case 7: >+ NDR_CHECK(ndr_push_spoolss_PrinterInfo7(ndr, NDR_BUFFERS, &r->info7)); >+ break; >+ >+ case 8: >+ NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info8)); >+ break; >+ >+ case 9: >+ NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info9)); >+ break; >+ >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -2881,180 +2966,191 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo(struct ndr_pull *ndr, in > { > uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr); > int level; >- level = ndr_pull_get_switch_value(ndr, r); >- if (ndr_flags & NDR_SCALARS) { >- NDR_CHECK(ndr_pull_union_align(ndr, 5)); >- switch (level) { >- case 0: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PrinterInfo0(ndr, NDR_SCALARS, &r->info0)); >- break; } >- >- case 1: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PrinterInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >- >- case 2: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PrinterInfo2(ndr, NDR_SCALARS, &r->info2)); >- break; } >- >- case 3: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PrinterInfo3(ndr, NDR_SCALARS, &r->info3)); >- break; } >- >- case 4: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PrinterInfo4(ndr, NDR_SCALARS, &r->info4)); >- break; } >- >- case 5: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PrinterInfo5(ndr, NDR_SCALARS, &r->info5)); >- break; } >- >- case 6: { >- NDR_CHECK(ndr_pull_align(ndr, 4)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PrinterInfo6(ndr, NDR_SCALARS, &r->info6)); >- break; } >- >- case 7: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PrinterInfo7(ndr, NDR_SCALARS, &r->info7)); >- break; } >- >- case 8: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info8)); >- break; } >- >- case 9: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info9)); >- break; } >- >- default: { >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_pull_get_switch_value(ndr, r); >+ if (ndr_flags & NDR_SCALARS) { >+ NDR_CHECK(ndr_pull_union_align(ndr, 5)); >+ switch (level) { >+ case 0: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PrinterInfo0(ndr, NDR_SCALARS, &r->info0)); >+ break; } >+ >+ case 1: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PrinterInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } >+ >+ case 2: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PrinterInfo2(ndr, NDR_SCALARS, &r->info2)); >+ break; } >+ >+ case 3: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PrinterInfo3(ndr, NDR_SCALARS, &r->info3)); >+ break; } >+ >+ case 4: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PrinterInfo4(ndr, NDR_SCALARS, &r->info4)); >+ break; } >+ >+ case 5: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PrinterInfo5(ndr, NDR_SCALARS, &r->info5)); >+ break; } >+ >+ case 6: { >+ NDR_CHECK(ndr_pull_align(ndr, 4)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PrinterInfo6(ndr, NDR_SCALARS, &r->info6)); >+ break; } >+ >+ case 7: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PrinterInfo7(ndr, NDR_SCALARS, &r->info7)); >+ break; } >+ >+ case 8: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info8)); >+ break; } >+ >+ case 9: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info9)); >+ break; } >+ >+ default: { >+ break; } >+ >+ } >+ } >+ if (ndr_flags & NDR_BUFFERS) { >+ NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 0: >+ NDR_CHECK(ndr_pull_spoolss_PrinterInfo0(ndr, NDR_BUFFERS, &r->info0)); >+ break; >+ >+ case 1: >+ NDR_CHECK(ndr_pull_spoolss_PrinterInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; >+ >+ case 2: >+ NDR_CHECK(ndr_pull_spoolss_PrinterInfo2(ndr, NDR_BUFFERS, &r->info2)); >+ break; >+ >+ case 3: >+ NDR_CHECK(ndr_pull_spoolss_PrinterInfo3(ndr, NDR_BUFFERS, &r->info3)); >+ break; >+ >+ case 4: >+ NDR_CHECK(ndr_pull_spoolss_PrinterInfo4(ndr, NDR_BUFFERS, &r->info4)); >+ break; >+ >+ case 5: >+ NDR_CHECK(ndr_pull_spoolss_PrinterInfo5(ndr, NDR_BUFFERS, &r->info5)); >+ break; >+ >+ case 6: >+ break; >+ >+ case 7: >+ NDR_CHECK(ndr_pull_spoolss_PrinterInfo7(ndr, NDR_BUFFERS, &r->info7)); >+ break; >+ >+ case 8: >+ NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info8)); >+ break; >+ >+ case 9: >+ NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info9)); >+ break; >+ >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } >- if (ndr_flags & NDR_BUFFERS) { >- NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >+ ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset); >+ return NDR_ERR_SUCCESS; >+} >+ >+_PUBLIC_ void ndr_print_spoolss_PrinterInfo(struct ndr_print *ndr, const char *name, const union spoolss_PrinterInfo *r) >+{ >+ int level; >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_print_get_switch_value(ndr, r); >+ ndr_print_union(ndr, name, level, "spoolss_PrinterInfo"); > switch (level) { > case 0: >- NDR_CHECK(ndr_pull_spoolss_PrinterInfo0(ndr, NDR_BUFFERS, &r->info0)); >+ ndr_print_spoolss_PrinterInfo0(ndr, "info0", &r->info0); > break; > > case 1: >- NDR_CHECK(ndr_pull_spoolss_PrinterInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ ndr_print_spoolss_PrinterInfo1(ndr, "info1", &r->info1); > break; > > case 2: >- NDR_CHECK(ndr_pull_spoolss_PrinterInfo2(ndr, NDR_BUFFERS, &r->info2)); >+ ndr_print_spoolss_PrinterInfo2(ndr, "info2", &r->info2); > break; > > case 3: >- NDR_CHECK(ndr_pull_spoolss_PrinterInfo3(ndr, NDR_BUFFERS, &r->info3)); >+ ndr_print_spoolss_PrinterInfo3(ndr, "info3", &r->info3); > break; > > case 4: >- NDR_CHECK(ndr_pull_spoolss_PrinterInfo4(ndr, NDR_BUFFERS, &r->info4)); >+ ndr_print_spoolss_PrinterInfo4(ndr, "info4", &r->info4); > break; > > case 5: >- NDR_CHECK(ndr_pull_spoolss_PrinterInfo5(ndr, NDR_BUFFERS, &r->info5)); >+ ndr_print_spoolss_PrinterInfo5(ndr, "info5", &r->info5); > break; > > case 6: >+ ndr_print_spoolss_PrinterInfo6(ndr, "info6", &r->info6); > break; > > case 7: >- NDR_CHECK(ndr_pull_spoolss_PrinterInfo7(ndr, NDR_BUFFERS, &r->info7)); >+ ndr_print_spoolss_PrinterInfo7(ndr, "info7", &r->info7); > break; > > case 8: >- NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info8)); >+ ndr_print_spoolss_DeviceModeInfo(ndr, "info8", &r->info8); > break; > > case 9: >- NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info9)); >+ ndr_print_spoolss_DeviceModeInfo(ndr, "info9", &r->info9); > break; > > default: > break; > > } >- } >- ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset); >- return NDR_ERR_SUCCESS; >-} >- >-_PUBLIC_ void ndr_print_spoolss_PrinterInfo(struct ndr_print *ndr, const char *name, const union spoolss_PrinterInfo *r) >-{ >- int level; >- level = ndr_print_get_switch_value(ndr, r); >- ndr_print_union(ndr, name, level, "spoolss_PrinterInfo"); >- switch (level) { >- case 0: >- ndr_print_spoolss_PrinterInfo0(ndr, "info0", &r->info0); >- break; >- >- case 1: >- ndr_print_spoolss_PrinterInfo1(ndr, "info1", &r->info1); >- break; >- >- case 2: >- ndr_print_spoolss_PrinterInfo2(ndr, "info2", &r->info2); >- break; >- >- case 3: >- ndr_print_spoolss_PrinterInfo3(ndr, "info3", &r->info3); >- break; >- >- case 4: >- ndr_print_spoolss_PrinterInfo4(ndr, "info4", &r->info4); >- break; >- >- case 5: >- ndr_print_spoolss_PrinterInfo5(ndr, "info5", &r->info5); >- break; >- >- case 6: >- ndr_print_spoolss_PrinterInfo6(ndr, "info6", &r->info6); >- break; >- >- case 7: >- ndr_print_spoolss_PrinterInfo7(ndr, "info7", &r->info7); >- break; >- >- case 8: >- ndr_print_spoolss_DeviceModeInfo(ndr, "info8", &r->info8); >- break; >- >- case 9: >- ndr_print_spoolss_DeviceModeInfo(ndr, "info9", &r->info9); >- break; >- >- default: >- break; >- >+ ndr->flags = _flags_save_UNION; > } > } > > _PUBLIC_ size_t ndr_size_spoolss_PrinterInfo(const union spoolss_PrinterInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags) > { >+ flags |= LIBNDR_FLAG_RELATIVE_REVERSE; > return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo, ic); > } > >@@ -3547,14 +3643,24 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_name)); > ndr->flags = _flags_save_string; > } >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->devmode)); >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->devmode)); >+ ndr->flags = _flags_save_spoolss_DeviceMode; >+ } > { > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->text_status)); > ndr->flags = _flags_save_string; > } >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); >+ ndr->flags = _flags_save_security_descriptor; >+ } > NDR_CHECK(ndr_push_spoolss_JobStatus(ndr, NDR_SCALARS, r->status)); > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->priority)); > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->position)); >@@ -3658,10 +3764,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > } > ndr->flags = _flags_save_string; > } >- if (r->devmode) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode)); >- NDR_CHECK(ndr_push_spoolss_DeviceMode(ndr, NDR_SCALARS, r->devmode)); >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode)); >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->devmode) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode)); >+ { >+ struct ndr_push *_ndr_devmode; >+ NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_devmode, 0, -1)); >+ NDR_CHECK(ndr_push_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); >+ NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_devmode, 0, -1)); >+ } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode)); >+ } >+ ndr->flags = _flags_save_spoolss_DeviceMode; > } > { > uint32_t _flags_save_string = ndr->flags; >@@ -3673,10 +3789,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > } > ndr->flags = _flags_save_string; > } >- if (r->secdesc) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); >- NDR_CHECK(ndr_push_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->secdesc) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); >+ { >+ struct ndr_push *_ndr_secdesc; >+ NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >+ NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); >+ } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); >+ } >+ ndr->flags = _flags_save_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -3819,12 +3945,17 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > ndr->flags = _flags_save_string; > } >- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode)); >- if (_ptr_devmode) { >- NDR_PULL_ALLOC(ndr, r->devmode); >- NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode)); >- } else { >- r->devmode = NULL; >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode)); >+ if (_ptr_devmode) { >+ NDR_PULL_ALLOC(ndr, r->devmode); >+ NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode)); >+ } else { >+ r->devmode = NULL; >+ } >+ ndr->flags = _flags_save_spoolss_DeviceMode; > } > { > uint32_t _flags_save_string = ndr->flags; >@@ -3838,12 +3969,17 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > ndr->flags = _flags_save_string; > } >- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); >- if (_ptr_secdesc) { >- NDR_PULL_ALLOC(ndr, r->secdesc); >- NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc)); >- } else { >- r->secdesc = NULL; >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); >+ if (_ptr_secdesc) { >+ NDR_PULL_ALLOC(ndr, r->secdesc); >+ NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc)); >+ } else { >+ r->secdesc = NULL; >+ } >+ ndr->flags = _flags_save_security_descriptor; > } > NDR_CHECK(ndr_pull_spoolss_JobStatus(ndr, NDR_SCALARS, &r->status)); > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->priority)); >@@ -3996,15 +4132,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > ndr->flags = _flags_save_string; > } >- if (r->devmode) { >- uint32_t _relative_save_offset; >- _relative_save_offset = ndr->offset; >- NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode)); >- _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr); >- NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0); >- NDR_CHECK(ndr_pull_spoolss_DeviceMode(ndr, NDR_SCALARS, r->devmode)); >- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0); >- ndr->offset = _relative_save_offset; >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->devmode) { >+ uint32_t _relative_save_offset; >+ _relative_save_offset = ndr->offset; >+ NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode)); >+ _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr); >+ NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0); >+ { >+ struct ndr_pull *_ndr_devmode; >+ NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_devmode, 0, -1)); >+ NDR_CHECK(ndr_pull_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); >+ NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_devmode, 0, -1)); >+ } >+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0); >+ ndr->offset = _relative_save_offset; >+ } >+ ndr->flags = _flags_save_spoolss_DeviceMode; > } > { > uint32_t _flags_save_string = ndr->flags; >@@ -4021,15 +4167,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > ndr->flags = _flags_save_string; > } >- if (r->secdesc) { >- uint32_t _relative_save_offset; >- _relative_save_offset = ndr->offset; >- NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc)); >- _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr); >- NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0); >- NDR_CHECK(ndr_pull_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); >- ndr->offset = _relative_save_offset; >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->secdesc) { >+ uint32_t _relative_save_offset; >+ _relative_save_offset = ndr->offset; >+ NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc)); >+ _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr); >+ NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0); >+ { >+ struct ndr_pull *_ndr_secdesc; >+ NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >+ NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1)); >+ } >+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); >+ ndr->offset = _relative_save_offset; >+ } >+ ndr->flags = _flags_save_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -4232,14 +4388,24 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_name)); > ndr->flags = _flags_save_string; > } >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->devmode)); >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->devmode)); >+ ndr->flags = _flags_save_spoolss_DeviceMode; >+ } > { > uint32_t _flags_save_string = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->text_status)); > ndr->flags = _flags_save_string; > } >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); >+ ndr->flags = _flags_save_security_descriptor; >+ } > NDR_CHECK(ndr_push_spoolss_JobStatus(ndr, NDR_SCALARS, r->status)); > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->priority)); > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->position)); >@@ -4344,10 +4510,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > } > ndr->flags = _flags_save_string; > } >- if (r->devmode) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode)); >- NDR_CHECK(ndr_push_spoolss_DeviceMode(ndr, NDR_SCALARS, r->devmode)); >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode)); >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->devmode) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode)); >+ { >+ struct ndr_push *_ndr_devmode; >+ NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_devmode, 0, -1)); >+ NDR_CHECK(ndr_push_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); >+ NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_devmode, 0, -1)); >+ } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode)); >+ } >+ ndr->flags = _flags_save_spoolss_DeviceMode; > } > { > uint32_t _flags_save_string = ndr->flags; >@@ -4359,10 +4535,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > } > ndr->flags = _flags_save_string; > } >- if (r->secdesc) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); >- NDR_CHECK(ndr_push_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->secdesc) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); >+ { >+ struct ndr_push *_ndr_secdesc; >+ NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >+ NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); >+ } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); >+ } >+ ndr->flags = _flags_save_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -4505,12 +4691,17 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > ndr->flags = _flags_save_string; > } >- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode)); >- if (_ptr_devmode) { >- NDR_PULL_ALLOC(ndr, r->devmode); >- NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode)); >- } else { >- r->devmode = NULL; >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode)); >+ if (_ptr_devmode) { >+ NDR_PULL_ALLOC(ndr, r->devmode); >+ NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode)); >+ } else { >+ r->devmode = NULL; >+ } >+ ndr->flags = _flags_save_spoolss_DeviceMode; > } > { > uint32_t _flags_save_string = ndr->flags; >@@ -4524,12 +4715,17 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > ndr->flags = _flags_save_string; > } >- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); >- if (_ptr_secdesc) { >- NDR_PULL_ALLOC(ndr, r->secdesc); >- NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc)); >- } else { >- r->secdesc = NULL; >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); >+ if (_ptr_secdesc) { >+ NDR_PULL_ALLOC(ndr, r->secdesc); >+ NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc)); >+ } else { >+ r->secdesc = NULL; >+ } >+ ndr->flags = _flags_save_security_descriptor; > } > NDR_CHECK(ndr_pull_spoolss_JobStatus(ndr, NDR_SCALARS, &r->status)); > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->priority)); >@@ -4683,15 +4879,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > ndr->flags = _flags_save_string; > } >- if (r->devmode) { >- uint32_t _relative_save_offset; >- _relative_save_offset = ndr->offset; >- NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode)); >- _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr); >- NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0); >- NDR_CHECK(ndr_pull_spoolss_DeviceMode(ndr, NDR_SCALARS, r->devmode)); >- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0); >- ndr->offset = _relative_save_offset; >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->devmode) { >+ uint32_t _relative_save_offset; >+ _relative_save_offset = ndr->offset; >+ NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode)); >+ _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr); >+ NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0); >+ { >+ struct ndr_pull *_ndr_devmode; >+ NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_devmode, 0, -1)); >+ NDR_CHECK(ndr_pull_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); >+ NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_devmode, 0, -1)); >+ } >+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0); >+ ndr->offset = _relative_save_offset; >+ } >+ ndr->flags = _flags_save_spoolss_DeviceMode; > } > { > uint32_t _flags_save_string = ndr->flags; >@@ -4708,15 +4914,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > ndr->flags = _flags_save_string; > } >- if (r->secdesc) { >- uint32_t _relative_save_offset; >- _relative_save_offset = ndr->offset; >- NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc)); >- _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr); >- NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0); >- NDR_CHECK(ndr_pull_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); >- ndr->offset = _relative_save_offset; >+ { >+ uint32_t _flags_save_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->secdesc) { >+ uint32_t _relative_save_offset; >+ _relative_save_offset = ndr->offset; >+ NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc)); >+ _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr); >+ NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0); >+ { >+ struct ndr_pull *_ndr_secdesc; >+ NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >+ NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1)); >+ } >+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); >+ ndr->offset = _relative_save_offset; >+ } >+ ndr->flags = _flags_save_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -4821,62 +5037,67 @@ _PUBLIC_ size_t ndr_size_spoolss_JobInfo4(const struct spoolss_JobInfo4 *r, stru > _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_JobInfo *r) > { > uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr); >- if (ndr_flags & NDR_SCALARS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_union_align(ndr, 5)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_JobInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ if (ndr_flags & NDR_SCALARS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_union_align(ndr, 5)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_JobInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- case 2: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_JobInfo2(ndr, NDR_SCALARS, &r->info2)); >- break; } >+ case 2: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_JobInfo2(ndr, NDR_SCALARS, &r->info2)); >+ break; } > >- case 3: { >- NDR_CHECK(ndr_push_align(ndr, 4)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_JobInfo3(ndr, NDR_SCALARS, &r->info3)); >- break; } >+ case 3: { >+ NDR_CHECK(ndr_push_align(ndr, 4)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_JobInfo3(ndr, NDR_SCALARS, &r->info3)); >+ break; } > >- case 4: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_JobInfo4(ndr, NDR_SCALARS, &r->info4)); >- break; } >+ case 4: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_JobInfo4(ndr, NDR_SCALARS, &r->info4)); >+ break; } > >- default: { >- break; } >+ default: { >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- NDR_CHECK(ndr_push_spoolss_JobInfo1(ndr, NDR_BUFFERS, &r->info1)); >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ NDR_CHECK(ndr_push_spoolss_JobInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; > >- case 2: >- NDR_CHECK(ndr_push_spoolss_JobInfo2(ndr, NDR_BUFFERS, &r->info2)); >- break; >+ case 2: >+ NDR_CHECK(ndr_push_spoolss_JobInfo2(ndr, NDR_BUFFERS, &r->info2)); >+ break; > >- case 3: >- break; >+ case 3: >+ break; > >- case 4: >- NDR_CHECK(ndr_push_spoolss_JobInfo4(ndr, NDR_BUFFERS, &r->info4)); >- break; >+ case 4: >+ NDR_CHECK(ndr_push_spoolss_JobInfo4(ndr, NDR_BUFFERS, &r->info4)); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -4886,61 +5107,66 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo(struct ndr_pull *ndr, int nd > { > uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr); > int level; >- level = ndr_pull_get_switch_value(ndr, r); >- if (ndr_flags & NDR_SCALARS) { >- NDR_CHECK(ndr_pull_union_align(ndr, 5)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_JobInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_pull_get_switch_value(ndr, r); >+ if (ndr_flags & NDR_SCALARS) { >+ NDR_CHECK(ndr_pull_union_align(ndr, 5)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_JobInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- case 2: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_JobInfo2(ndr, NDR_SCALARS, &r->info2)); >- break; } >+ case 2: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_JobInfo2(ndr, NDR_SCALARS, &r->info2)); >+ break; } > >- case 3: { >- NDR_CHECK(ndr_pull_align(ndr, 4)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_JobInfo3(ndr, NDR_SCALARS, &r->info3)); >- break; } >+ case 3: { >+ NDR_CHECK(ndr_pull_align(ndr, 4)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_JobInfo3(ndr, NDR_SCALARS, &r->info3)); >+ break; } > >- case 4: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_JobInfo4(ndr, NDR_SCALARS, &r->info4)); >- break; } >+ case 4: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_JobInfo4(ndr, NDR_SCALARS, &r->info4)); >+ break; } > >- default: { >- break; } >+ default: { >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- NDR_CHECK(ndr_pull_spoolss_JobInfo1(ndr, NDR_BUFFERS, &r->info1)); >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ NDR_CHECK(ndr_pull_spoolss_JobInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; > >- case 2: >- NDR_CHECK(ndr_pull_spoolss_JobInfo2(ndr, NDR_BUFFERS, &r->info2)); >- break; >+ case 2: >+ NDR_CHECK(ndr_pull_spoolss_JobInfo2(ndr, NDR_BUFFERS, &r->info2)); >+ break; > >- case 3: >- break; >+ case 3: >+ break; > >- case 4: >- NDR_CHECK(ndr_pull_spoolss_JobInfo4(ndr, NDR_BUFFERS, &r->info4)); >- break; >+ case 4: >+ NDR_CHECK(ndr_pull_spoolss_JobInfo4(ndr, NDR_BUFFERS, &r->info4)); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -4949,33 +5175,39 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo(struct ndr_pull *ndr, int nd > _PUBLIC_ void ndr_print_spoolss_JobInfo(struct ndr_print *ndr, const char *name, const union spoolss_JobInfo *r) > { > int level; >- level = ndr_print_get_switch_value(ndr, r); >- ndr_print_union(ndr, name, level, "spoolss_JobInfo"); >- switch (level) { >- case 1: >- ndr_print_spoolss_JobInfo1(ndr, "info1", &r->info1); >- break; >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_print_get_switch_value(ndr, r); >+ ndr_print_union(ndr, name, level, "spoolss_JobInfo"); >+ switch (level) { >+ case 1: >+ ndr_print_spoolss_JobInfo1(ndr, "info1", &r->info1); >+ break; > >- case 2: >- ndr_print_spoolss_JobInfo2(ndr, "info2", &r->info2); >- break; >+ case 2: >+ ndr_print_spoolss_JobInfo2(ndr, "info2", &r->info2); >+ break; > >- case 3: >- ndr_print_spoolss_JobInfo3(ndr, "info3", &r->info3); >- break; >+ case 3: >+ ndr_print_spoolss_JobInfo3(ndr, "info3", &r->info3); >+ break; > >- case 4: >- ndr_print_spoolss_JobInfo4(ndr, "info4", &r->info4); >- break; >+ case 4: >+ ndr_print_spoolss_JobInfo4(ndr, "info4", &r->info4); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } >+ ndr->flags = _flags_save_UNION; > } > } > > _PUBLIC_ size_t ndr_size_spoolss_JobInfo(const union spoolss_JobInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags) > { >+ flags |= LIBNDR_FLAG_RELATIVE_REVERSE; > return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_JobInfo, ic); > } > >@@ -14362,113 +14594,118 @@ _PUBLIC_ size_t ndr_size_spoolss_DriverInfo101(const struct spoolss_DriverInfo10 > _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_DriverInfo *r) > { > uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr); >- if (ndr_flags & NDR_SCALARS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_union_align(ndr, 8)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_DriverInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >- >- case 2: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_DriverInfo2(ndr, NDR_SCALARS, &r->info2)); >- break; } >- >- case 3: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_DriverInfo3(ndr, NDR_SCALARS, &r->info3)); >- break; } >- >- case 4: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_DriverInfo4(ndr, NDR_SCALARS, &r->info4)); >- break; } >- >- case 5: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_DriverInfo5(ndr, NDR_SCALARS, &r->info5)); >- break; } >- >- case 6: { >- NDR_CHECK(ndr_push_align(ndr, 8)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_DriverInfo6(ndr, NDR_SCALARS, &r->info6)); >- break; } >- >- case 7: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_DriverInfo7(ndr, NDR_SCALARS, &r->info7)); >- break; } >- >- case 8: { >- NDR_CHECK(ndr_push_align(ndr, 8)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_DriverInfo8(ndr, NDR_SCALARS, &r->info8)); >- break; } >- >- case 101: { >- NDR_CHECK(ndr_push_align(ndr, 8)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_DriverInfo101(ndr, NDR_SCALARS, &r->info101)); >- break; } >- >- default: { >- break; } >- >- } >- } >- if (ndr_flags & NDR_BUFFERS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- NDR_CHECK(ndr_push_spoolss_DriverInfo1(ndr, NDR_BUFFERS, &r->info1)); >- break; >- >- case 2: >- NDR_CHECK(ndr_push_spoolss_DriverInfo2(ndr, NDR_BUFFERS, &r->info2)); >- break; >- >- case 3: >- NDR_CHECK(ndr_push_spoolss_DriverInfo3(ndr, NDR_BUFFERS, &r->info3)); >- break; >- >- case 4: >- NDR_CHECK(ndr_push_spoolss_DriverInfo4(ndr, NDR_BUFFERS, &r->info4)); >- break; >- >- case 5: >- NDR_CHECK(ndr_push_spoolss_DriverInfo5(ndr, NDR_BUFFERS, &r->info5)); >- break; >- >- case 6: >- NDR_CHECK(ndr_push_spoolss_DriverInfo6(ndr, NDR_BUFFERS, &r->info6)); >- break; >- >- case 7: >- NDR_CHECK(ndr_push_spoolss_DriverInfo7(ndr, NDR_BUFFERS, &r->info7)); >- break; >- >- case 8: >- NDR_CHECK(ndr_push_spoolss_DriverInfo8(ndr, NDR_BUFFERS, &r->info8)); >- break; >- >- case 101: >- NDR_CHECK(ndr_push_spoolss_DriverInfo101(ndr, NDR_BUFFERS, &r->info101)); >- break; >- >- default: >- break; >- >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ if (ndr_flags & NDR_SCALARS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_union_align(ndr, 8)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_DriverInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } >+ >+ case 2: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_DriverInfo2(ndr, NDR_SCALARS, &r->info2)); >+ break; } >+ >+ case 3: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_DriverInfo3(ndr, NDR_SCALARS, &r->info3)); >+ break; } >+ >+ case 4: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_DriverInfo4(ndr, NDR_SCALARS, &r->info4)); >+ break; } >+ >+ case 5: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_DriverInfo5(ndr, NDR_SCALARS, &r->info5)); >+ break; } >+ >+ case 6: { >+ NDR_CHECK(ndr_push_align(ndr, 8)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_DriverInfo6(ndr, NDR_SCALARS, &r->info6)); >+ break; } >+ >+ case 7: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_DriverInfo7(ndr, NDR_SCALARS, &r->info7)); >+ break; } >+ >+ case 8: { >+ NDR_CHECK(ndr_push_align(ndr, 8)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_DriverInfo8(ndr, NDR_SCALARS, &r->info8)); >+ break; } >+ >+ case 101: { >+ NDR_CHECK(ndr_push_align(ndr, 8)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_DriverInfo101(ndr, NDR_SCALARS, &r->info101)); >+ break; } >+ >+ default: { >+ break; } >+ >+ } >+ } >+ if (ndr_flags & NDR_BUFFERS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ NDR_CHECK(ndr_push_spoolss_DriverInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; >+ >+ case 2: >+ NDR_CHECK(ndr_push_spoolss_DriverInfo2(ndr, NDR_BUFFERS, &r->info2)); >+ break; >+ >+ case 3: >+ NDR_CHECK(ndr_push_spoolss_DriverInfo3(ndr, NDR_BUFFERS, &r->info3)); >+ break; >+ >+ case 4: >+ NDR_CHECK(ndr_push_spoolss_DriverInfo4(ndr, NDR_BUFFERS, &r->info4)); >+ break; >+ >+ case 5: >+ NDR_CHECK(ndr_push_spoolss_DriverInfo5(ndr, NDR_BUFFERS, &r->info5)); >+ break; >+ >+ case 6: >+ NDR_CHECK(ndr_push_spoolss_DriverInfo6(ndr, NDR_BUFFERS, &r->info6)); >+ break; >+ >+ case 7: >+ NDR_CHECK(ndr_push_spoolss_DriverInfo7(ndr, NDR_BUFFERS, &r->info7)); >+ break; >+ >+ case 8: >+ NDR_CHECK(ndr_push_spoolss_DriverInfo8(ndr, NDR_BUFFERS, &r->info8)); >+ break; >+ >+ case 101: >+ NDR_CHECK(ndr_push_spoolss_DriverInfo101(ndr, NDR_BUFFERS, &r->info101)); >+ break; >+ >+ default: >+ break; >+ >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -14478,167 +14715,178 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo(struct ndr_pull *ndr, int > { > uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr); > int level; >- level = ndr_pull_get_switch_value(ndr, r); >- if (ndr_flags & NDR_SCALARS) { >- NDR_CHECK(ndr_pull_union_align(ndr, 8)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_DriverInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >- >- case 2: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_DriverInfo2(ndr, NDR_SCALARS, &r->info2)); >- break; } >- >- case 3: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_DriverInfo3(ndr, NDR_SCALARS, &r->info3)); >- break; } >- >- case 4: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_DriverInfo4(ndr, NDR_SCALARS, &r->info4)); >- break; } >- >- case 5: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_DriverInfo5(ndr, NDR_SCALARS, &r->info5)); >- break; } >- >- case 6: { >- NDR_CHECK(ndr_pull_align(ndr, 8)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_DriverInfo6(ndr, NDR_SCALARS, &r->info6)); >- break; } >- >- case 7: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_DriverInfo7(ndr, NDR_SCALARS, &r->info7)); >- break; } >- >- case 8: { >- NDR_CHECK(ndr_pull_align(ndr, 8)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_DriverInfo8(ndr, NDR_SCALARS, &r->info8)); >- break; } >- >- case 101: { >- NDR_CHECK(ndr_pull_align(ndr, 8)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_DriverInfo101(ndr, NDR_SCALARS, &r->info101)); >- break; } >- >- default: { >- break; } >- >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_pull_get_switch_value(ndr, r); >+ if (ndr_flags & NDR_SCALARS) { >+ NDR_CHECK(ndr_pull_union_align(ndr, 8)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } >+ >+ case 2: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo2(ndr, NDR_SCALARS, &r->info2)); >+ break; } >+ >+ case 3: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo3(ndr, NDR_SCALARS, &r->info3)); >+ break; } >+ >+ case 4: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo4(ndr, NDR_SCALARS, &r->info4)); >+ break; } >+ >+ case 5: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo5(ndr, NDR_SCALARS, &r->info5)); >+ break; } >+ >+ case 6: { >+ NDR_CHECK(ndr_pull_align(ndr, 8)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo6(ndr, NDR_SCALARS, &r->info6)); >+ break; } >+ >+ case 7: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo7(ndr, NDR_SCALARS, &r->info7)); >+ break; } >+ >+ case 8: { >+ NDR_CHECK(ndr_pull_align(ndr, 8)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo8(ndr, NDR_SCALARS, &r->info8)); >+ break; } >+ >+ case 101: { >+ NDR_CHECK(ndr_pull_align(ndr, 8)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo101(ndr, NDR_SCALARS, &r->info101)); >+ break; } >+ >+ default: { >+ break; } >+ >+ } >+ } >+ if (ndr_flags & NDR_BUFFERS) { >+ NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; >+ >+ case 2: >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo2(ndr, NDR_BUFFERS, &r->info2)); >+ break; >+ >+ case 3: >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo3(ndr, NDR_BUFFERS, &r->info3)); >+ break; >+ >+ case 4: >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo4(ndr, NDR_BUFFERS, &r->info4)); >+ break; >+ >+ case 5: >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo5(ndr, NDR_BUFFERS, &r->info5)); >+ break; >+ >+ case 6: >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo6(ndr, NDR_BUFFERS, &r->info6)); >+ break; >+ >+ case 7: >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo7(ndr, NDR_BUFFERS, &r->info7)); >+ break; >+ >+ case 8: >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo8(ndr, NDR_BUFFERS, &r->info8)); >+ break; >+ >+ case 101: >+ NDR_CHECK(ndr_pull_spoolss_DriverInfo101(ndr, NDR_BUFFERS, &r->info101)); >+ break; >+ >+ default: >+ break; >+ >+ } > } >+ ndr->flags = _flags_save_UNION; > } >- if (ndr_flags & NDR_BUFFERS) { >- NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >+ ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset); >+ return NDR_ERR_SUCCESS; >+} >+ >+_PUBLIC_ void ndr_print_spoolss_DriverInfo(struct ndr_print *ndr, const char *name, const union spoolss_DriverInfo *r) >+{ >+ int level; >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_print_get_switch_value(ndr, r); >+ ndr_print_union(ndr, name, level, "spoolss_DriverInfo"); > switch (level) { > case 1: >- NDR_CHECK(ndr_pull_spoolss_DriverInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ ndr_print_spoolss_DriverInfo1(ndr, "info1", &r->info1); > break; > > case 2: >- NDR_CHECK(ndr_pull_spoolss_DriverInfo2(ndr, NDR_BUFFERS, &r->info2)); >+ ndr_print_spoolss_DriverInfo2(ndr, "info2", &r->info2); > break; > > case 3: >- NDR_CHECK(ndr_pull_spoolss_DriverInfo3(ndr, NDR_BUFFERS, &r->info3)); >+ ndr_print_spoolss_DriverInfo3(ndr, "info3", &r->info3); > break; > > case 4: >- NDR_CHECK(ndr_pull_spoolss_DriverInfo4(ndr, NDR_BUFFERS, &r->info4)); >+ ndr_print_spoolss_DriverInfo4(ndr, "info4", &r->info4); > break; > > case 5: >- NDR_CHECK(ndr_pull_spoolss_DriverInfo5(ndr, NDR_BUFFERS, &r->info5)); >+ ndr_print_spoolss_DriverInfo5(ndr, "info5", &r->info5); > break; > > case 6: >- NDR_CHECK(ndr_pull_spoolss_DriverInfo6(ndr, NDR_BUFFERS, &r->info6)); >+ ndr_print_spoolss_DriverInfo6(ndr, "info6", &r->info6); > break; > > case 7: >- NDR_CHECK(ndr_pull_spoolss_DriverInfo7(ndr, NDR_BUFFERS, &r->info7)); >+ ndr_print_spoolss_DriverInfo7(ndr, "info7", &r->info7); > break; > > case 8: >- NDR_CHECK(ndr_pull_spoolss_DriverInfo8(ndr, NDR_BUFFERS, &r->info8)); >+ ndr_print_spoolss_DriverInfo8(ndr, "info8", &r->info8); > break; > > case 101: >- NDR_CHECK(ndr_pull_spoolss_DriverInfo101(ndr, NDR_BUFFERS, &r->info101)); >+ ndr_print_spoolss_DriverInfo101(ndr, "info101", &r->info101); > break; > > default: > break; > > } >- } >- ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset); >- return NDR_ERR_SUCCESS; >-} >- >-_PUBLIC_ void ndr_print_spoolss_DriverInfo(struct ndr_print *ndr, const char *name, const union spoolss_DriverInfo *r) >-{ >- int level; >- level = ndr_print_get_switch_value(ndr, r); >- ndr_print_union(ndr, name, level, "spoolss_DriverInfo"); >- switch (level) { >- case 1: >- ndr_print_spoolss_DriverInfo1(ndr, "info1", &r->info1); >- break; >- >- case 2: >- ndr_print_spoolss_DriverInfo2(ndr, "info2", &r->info2); >- break; >- >- case 3: >- ndr_print_spoolss_DriverInfo3(ndr, "info3", &r->info3); >- break; >- >- case 4: >- ndr_print_spoolss_DriverInfo4(ndr, "info4", &r->info4); >- break; >- >- case 5: >- ndr_print_spoolss_DriverInfo5(ndr, "info5", &r->info5); >- break; >- >- case 6: >- ndr_print_spoolss_DriverInfo6(ndr, "info6", &r->info6); >- break; >- >- case 7: >- ndr_print_spoolss_DriverInfo7(ndr, "info7", &r->info7); >- break; >- >- case 8: >- ndr_print_spoolss_DriverInfo8(ndr, "info8", &r->info8); >- break; >- >- case 101: >- ndr_print_spoolss_DriverInfo101(ndr, "info101", &r->info101); >- break; >- >- default: >- break; >- >+ ndr->flags = _flags_save_UNION; > } > } > > _PUBLIC_ size_t ndr_size_spoolss_DriverInfo(const union spoolss_DriverInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags) > { >+ flags |= LIBNDR_FLAG_RELATIVE_REVERSE; > return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_DriverInfo, ic); > } > >@@ -14692,35 +14940,40 @@ _PUBLIC_ size_t ndr_size_spoolss_DriverDirectoryInfo1(const struct spoolss_Drive > _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverDirectoryInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_DriverDirectoryInfo *r) > { > uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr); >- if (ndr_flags & NDR_SCALARS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_union_align(ndr, 4)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_push_align(ndr, 4)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ if (ndr_flags & NDR_SCALARS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_union_align(ndr, 4)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_push_align(ndr, 4)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- default: { >- NDR_CHECK(ndr_push_align(ndr, 4)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ default: { >+ NDR_CHECK(ndr_push_align(ndr, 4)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -14730,34 +14983,39 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverDirectoryInfo(struct ndr_pull > { > uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr); > int level; >- level = ndr_pull_get_switch_value(ndr, r); >- if (ndr_flags & NDR_SCALARS) { >- NDR_CHECK(ndr_pull_union_align(ndr, 4)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_pull_align(ndr, 4)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_pull_get_switch_value(ndr, r); >+ if (ndr_flags & NDR_SCALARS) { >+ NDR_CHECK(ndr_pull_union_align(ndr, 4)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_pull_align(ndr, 4)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- default: { >- NDR_CHECK(ndr_pull_align(ndr, 4)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ default: { >+ NDR_CHECK(ndr_pull_align(ndr, 4)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -14766,22 +15024,28 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverDirectoryInfo(struct ndr_pull > _PUBLIC_ void ndr_print_spoolss_DriverDirectoryInfo(struct ndr_print *ndr, const char *name, const union spoolss_DriverDirectoryInfo *r) > { > int level; >- level = ndr_print_get_switch_value(ndr, r); >- ndr_print_union(ndr, name, level, "spoolss_DriverDirectoryInfo"); >- switch (level) { >- case 1: >- ndr_print_spoolss_DriverDirectoryInfo1(ndr, "info1", &r->info1); >- break; >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_print_get_switch_value(ndr, r); >+ ndr_print_union(ndr, name, level, "spoolss_DriverDirectoryInfo"); >+ switch (level) { >+ case 1: >+ ndr_print_spoolss_DriverDirectoryInfo1(ndr, "info1", &r->info1); >+ break; > >- default: >- ndr_print_spoolss_DriverDirectoryInfo1(ndr, "info1", &r->info1); >- break; >+ default: >+ ndr_print_spoolss_DriverDirectoryInfo1(ndr, "info1", &r->info1); >+ break; > >+ } >+ ndr->flags = _flags_save_UNION; > } > } > > _PUBLIC_ size_t ndr_size_spoolss_DriverDirectoryInfo(const union spoolss_DriverDirectoryInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags) > { >+ flags |= LIBNDR_FLAG_RELATIVE_REVERSE; > return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_DriverDirectoryInfo, ic); > } > >@@ -14873,33 +15137,38 @@ _PUBLIC_ size_t ndr_size_spoolss_PrintProcessorInfo1(const struct spoolss_PrintP > _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrintProcessorInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_PrintProcessorInfo *r) > { > uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr); >- if (ndr_flags & NDR_SCALARS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_union_align(ndr, 5)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PrintProcessorInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ if (ndr_flags & NDR_SCALARS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_union_align(ndr, 5)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PrintProcessorInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- default: { >- break; } >+ default: { >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- NDR_CHECK(ndr_push_spoolss_PrintProcessorInfo1(ndr, NDR_BUFFERS, &r->info1)); >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ NDR_CHECK(ndr_push_spoolss_PrintProcessorInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -14909,32 +15178,37 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcessorInfo(struct ndr_pull * > { > uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr); > int level; >- level = ndr_pull_get_switch_value(ndr, r); >- if (ndr_flags & NDR_SCALARS) { >- NDR_CHECK(ndr_pull_union_align(ndr, 5)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PrintProcessorInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_pull_get_switch_value(ndr, r); >+ if (ndr_flags & NDR_SCALARS) { >+ NDR_CHECK(ndr_pull_union_align(ndr, 5)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PrintProcessorInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- default: { >- break; } >+ default: { >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- NDR_CHECK(ndr_pull_spoolss_PrintProcessorInfo1(ndr, NDR_BUFFERS, &r->info1)); >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ NDR_CHECK(ndr_pull_spoolss_PrintProcessorInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -14943,16 +15217,21 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcessorInfo(struct ndr_pull * > _PUBLIC_ void ndr_print_spoolss_PrintProcessorInfo(struct ndr_print *ndr, const char *name, const union spoolss_PrintProcessorInfo *r) > { > int level; >- level = ndr_print_get_switch_value(ndr, r); >- ndr_print_union(ndr, name, level, "spoolss_PrintProcessorInfo"); >- switch (level) { >- case 1: >- ndr_print_spoolss_PrintProcessorInfo1(ndr, "info1", &r->info1); >- break; >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_print_get_switch_value(ndr, r); >+ ndr_print_union(ndr, name, level, "spoolss_PrintProcessorInfo"); >+ switch (level) { >+ case 1: >+ ndr_print_spoolss_PrintProcessorInfo1(ndr, "info1", &r->info1); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } >+ ndr->flags = _flags_save_UNION; > } > } > >@@ -15006,35 +15285,40 @@ _PUBLIC_ size_t ndr_size_spoolss_PrintProcessorDirectoryInfo1(const struct spool > _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrintProcessorDirectoryInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_PrintProcessorDirectoryInfo *r) > { > uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr); >- if (ndr_flags & NDR_SCALARS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_union_align(ndr, 4)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_push_align(ndr, 4)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ if (ndr_flags & NDR_SCALARS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_union_align(ndr, 4)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_push_align(ndr, 4)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- default: { >- NDR_CHECK(ndr_push_align(ndr, 4)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ default: { >+ NDR_CHECK(ndr_push_align(ndr, 4)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -15044,34 +15328,39 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcessorDirectoryInfo(struct n > { > uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr); > int level; >- level = ndr_pull_get_switch_value(ndr, r); >- if (ndr_flags & NDR_SCALARS) { >- NDR_CHECK(ndr_pull_union_align(ndr, 4)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_pull_align(ndr, 4)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_pull_get_switch_value(ndr, r); >+ if (ndr_flags & NDR_SCALARS) { >+ NDR_CHECK(ndr_pull_union_align(ndr, 4)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_pull_align(ndr, 4)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- default: { >- NDR_CHECK(ndr_pull_align(ndr, 4)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ default: { >+ NDR_CHECK(ndr_pull_align(ndr, 4)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -15080,22 +15369,28 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcessorDirectoryInfo(struct n > _PUBLIC_ void ndr_print_spoolss_PrintProcessorDirectoryInfo(struct ndr_print *ndr, const char *name, const union spoolss_PrintProcessorDirectoryInfo *r) > { > int level; >- level = ndr_print_get_switch_value(ndr, r); >- ndr_print_union(ndr, name, level, "spoolss_PrintProcessorDirectoryInfo"); >- switch (level) { >- case 1: >- ndr_print_spoolss_PrintProcessorDirectoryInfo1(ndr, "info1", &r->info1); >- break; >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_print_get_switch_value(ndr, r); >+ ndr_print_union(ndr, name, level, "spoolss_PrintProcessorDirectoryInfo"); >+ switch (level) { >+ case 1: >+ ndr_print_spoolss_PrintProcessorDirectoryInfo1(ndr, "info1", &r->info1); >+ break; > >- default: >- ndr_print_spoolss_PrintProcessorDirectoryInfo1(ndr, "info1", &r->info1); >- break; >+ default: >+ ndr_print_spoolss_PrintProcessorDirectoryInfo1(ndr, "info1", &r->info1); >+ break; > >+ } >+ ndr->flags = _flags_save_UNION; > } > } > > _PUBLIC_ size_t ndr_size_spoolss_PrintProcessorDirectoryInfo(const union spoolss_PrintProcessorDirectoryInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags) > { >+ flags |= LIBNDR_FLAG_RELATIVE_REVERSE; > return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_PrintProcessorDirectoryInfo, ic); > } > >@@ -16185,43 +16480,48 @@ _PUBLIC_ size_t ndr_size_spoolss_FormInfo2(const struct spoolss_FormInfo2 *r, st > _PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_FormInfo *r) > { > uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr); >- if (ndr_flags & NDR_SCALARS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_union_align(ndr, 5)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_FormInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ if (ndr_flags & NDR_SCALARS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_union_align(ndr, 5)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_FormInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- case 2: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_FormInfo2(ndr, NDR_SCALARS, &r->info2)); >- break; } >+ case 2: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_FormInfo2(ndr, NDR_SCALARS, &r->info2)); >+ break; } > >- default: { >- break; } >+ default: { >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- NDR_CHECK(ndr_push_spoolss_FormInfo1(ndr, NDR_BUFFERS, &r->info1)); >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ NDR_CHECK(ndr_push_spoolss_FormInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; > >- case 2: >- NDR_CHECK(ndr_push_spoolss_FormInfo2(ndr, NDR_BUFFERS, &r->info2)); >- break; >+ case 2: >+ NDR_CHECK(ndr_push_spoolss_FormInfo2(ndr, NDR_BUFFERS, &r->info2)); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -16231,42 +16531,47 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo(struct ndr_pull *ndr, int n > { > uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr); > int level; >- level = ndr_pull_get_switch_value(ndr, r); >- if (ndr_flags & NDR_SCALARS) { >- NDR_CHECK(ndr_pull_union_align(ndr, 5)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_FormInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_pull_get_switch_value(ndr, r); >+ if (ndr_flags & NDR_SCALARS) { >+ NDR_CHECK(ndr_pull_union_align(ndr, 5)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_FormInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- case 2: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_FormInfo2(ndr, NDR_SCALARS, &r->info2)); >- break; } >+ case 2: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_FormInfo2(ndr, NDR_SCALARS, &r->info2)); >+ break; } > >- default: { >- break; } >+ default: { >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- NDR_CHECK(ndr_pull_spoolss_FormInfo1(ndr, NDR_BUFFERS, &r->info1)); >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ NDR_CHECK(ndr_pull_spoolss_FormInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; > >- case 2: >- NDR_CHECK(ndr_pull_spoolss_FormInfo2(ndr, NDR_BUFFERS, &r->info2)); >- break; >+ case 2: >+ NDR_CHECK(ndr_pull_spoolss_FormInfo2(ndr, NDR_BUFFERS, &r->info2)); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -16275,25 +16580,31 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo(struct ndr_pull *ndr, int n > _PUBLIC_ void ndr_print_spoolss_FormInfo(struct ndr_print *ndr, const char *name, const union spoolss_FormInfo *r) > { > int level; >- level = ndr_print_get_switch_value(ndr, r); >- ndr_print_union(ndr, name, level, "spoolss_FormInfo"); >- switch (level) { >- case 1: >- ndr_print_spoolss_FormInfo1(ndr, "info1", &r->info1); >- break; >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_print_get_switch_value(ndr, r); >+ ndr_print_union(ndr, name, level, "spoolss_FormInfo"); >+ switch (level) { >+ case 1: >+ ndr_print_spoolss_FormInfo1(ndr, "info1", &r->info1); >+ break; > >- case 2: >- ndr_print_spoolss_FormInfo2(ndr, "info2", &r->info2); >- break; >+ case 2: >+ ndr_print_spoolss_FormInfo2(ndr, "info2", &r->info2); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } >+ ndr->flags = _flags_save_UNION; > } > } > > _PUBLIC_ size_t ndr_size_spoolss_FormInfo(const union spoolss_FormInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags) > { >+ flags |= LIBNDR_FLAG_RELATIVE_REVERSE; > return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_FormInfo, ic); > } > >@@ -17229,63 +17540,68 @@ _PUBLIC_ size_t ndr_size_spoolss_PortInfoFF(const struct spoolss_PortInfoFF *r, > _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_PortInfo *r) > { > uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr); >- if (ndr_flags & NDR_SCALARS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_union_align(ndr, 5)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PortInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ if (ndr_flags & NDR_SCALARS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_union_align(ndr, 5)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PortInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- case 2: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PortInfo2(ndr, NDR_SCALARS, &r->info2)); >- break; } >+ case 2: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PortInfo2(ndr, NDR_SCALARS, &r->info2)); >+ break; } > >- case 3: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PortInfo3(ndr, NDR_SCALARS, &r->info3)); >- break; } >+ case 3: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PortInfo3(ndr, NDR_SCALARS, &r->info3)); >+ break; } > >- case 0xff: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PortInfoFF(ndr, NDR_SCALARS, &r->infoFF)); >- break; } >+ case 0xff: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PortInfoFF(ndr, NDR_SCALARS, &r->infoFF)); >+ break; } > >- default: { >- break; } >+ default: { >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- NDR_CHECK(ndr_push_spoolss_PortInfo1(ndr, NDR_BUFFERS, &r->info1)); >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ NDR_CHECK(ndr_push_spoolss_PortInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; > >- case 2: >- NDR_CHECK(ndr_push_spoolss_PortInfo2(ndr, NDR_BUFFERS, &r->info2)); >- break; >+ case 2: >+ NDR_CHECK(ndr_push_spoolss_PortInfo2(ndr, NDR_BUFFERS, &r->info2)); >+ break; > >- case 3: >- NDR_CHECK(ndr_push_spoolss_PortInfo3(ndr, NDR_BUFFERS, &r->info3)); >- break; >+ case 3: >+ NDR_CHECK(ndr_push_spoolss_PortInfo3(ndr, NDR_BUFFERS, &r->info3)); >+ break; > >- case 0xff: >- NDR_CHECK(ndr_push_spoolss_PortInfoFF(ndr, NDR_BUFFERS, &r->infoFF)); >- break; >+ case 0xff: >+ NDR_CHECK(ndr_push_spoolss_PortInfoFF(ndr, NDR_BUFFERS, &r->infoFF)); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -17295,62 +17611,67 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfo(struct ndr_pull *ndr, int n > { > uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr); > int level; >- level = ndr_pull_get_switch_value(ndr, r); >- if (ndr_flags & NDR_SCALARS) { >- NDR_CHECK(ndr_pull_union_align(ndr, 5)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PortInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_pull_get_switch_value(ndr, r); >+ if (ndr_flags & NDR_SCALARS) { >+ NDR_CHECK(ndr_pull_union_align(ndr, 5)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PortInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- case 2: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PortInfo2(ndr, NDR_SCALARS, &r->info2)); >- break; } >+ case 2: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PortInfo2(ndr, NDR_SCALARS, &r->info2)); >+ break; } > >- case 3: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PortInfo3(ndr, NDR_SCALARS, &r->info3)); >- break; } >+ case 3: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PortInfo3(ndr, NDR_SCALARS, &r->info3)); >+ break; } > >- case 0xff: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PortInfoFF(ndr, NDR_SCALARS, &r->infoFF)); >- break; } >+ case 0xff: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PortInfoFF(ndr, NDR_SCALARS, &r->infoFF)); >+ break; } > >- default: { >- break; } >+ default: { >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- NDR_CHECK(ndr_pull_spoolss_PortInfo1(ndr, NDR_BUFFERS, &r->info1)); >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ NDR_CHECK(ndr_pull_spoolss_PortInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; > >- case 2: >- NDR_CHECK(ndr_pull_spoolss_PortInfo2(ndr, NDR_BUFFERS, &r->info2)); >- break; >+ case 2: >+ NDR_CHECK(ndr_pull_spoolss_PortInfo2(ndr, NDR_BUFFERS, &r->info2)); >+ break; > >- case 3: >- NDR_CHECK(ndr_pull_spoolss_PortInfo3(ndr, NDR_BUFFERS, &r->info3)); >- break; >+ case 3: >+ NDR_CHECK(ndr_pull_spoolss_PortInfo3(ndr, NDR_BUFFERS, &r->info3)); >+ break; > >- case 0xff: >- NDR_CHECK(ndr_pull_spoolss_PortInfoFF(ndr, NDR_BUFFERS, &r->infoFF)); >- break; >+ case 0xff: >+ NDR_CHECK(ndr_pull_spoolss_PortInfoFF(ndr, NDR_BUFFERS, &r->infoFF)); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -17359,28 +17680,33 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfo(struct ndr_pull *ndr, int n > _PUBLIC_ void ndr_print_spoolss_PortInfo(struct ndr_print *ndr, const char *name, const union spoolss_PortInfo *r) > { > int level; >- level = ndr_print_get_switch_value(ndr, r); >- ndr_print_union(ndr, name, level, "spoolss_PortInfo"); >- switch (level) { >- case 1: >- ndr_print_spoolss_PortInfo1(ndr, "info1", &r->info1); >- break; >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_print_get_switch_value(ndr, r); >+ ndr_print_union(ndr, name, level, "spoolss_PortInfo"); >+ switch (level) { >+ case 1: >+ ndr_print_spoolss_PortInfo1(ndr, "info1", &r->info1); >+ break; > >- case 2: >- ndr_print_spoolss_PortInfo2(ndr, "info2", &r->info2); >- break; >+ case 2: >+ ndr_print_spoolss_PortInfo2(ndr, "info2", &r->info2); >+ break; > >- case 3: >- ndr_print_spoolss_PortInfo3(ndr, "info3", &r->info3); >- break; >+ case 3: >+ ndr_print_spoolss_PortInfo3(ndr, "info3", &r->info3); >+ break; > >- case 0xff: >- ndr_print_spoolss_PortInfoFF(ndr, "infoFF", &r->infoFF); >- break; >+ case 0xff: >+ ndr_print_spoolss_PortInfoFF(ndr, "infoFF", &r->infoFF); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } >+ ndr->flags = _flags_save_UNION; > } > } > >@@ -17659,43 +17985,48 @@ _PUBLIC_ size_t ndr_size_spoolss_MonitorInfo2(const struct spoolss_MonitorInfo2 > _PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_MonitorInfo *r) > { > uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr); >- if (ndr_flags & NDR_SCALARS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_union_align(ndr, 5)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_MonitorInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ if (ndr_flags & NDR_SCALARS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_union_align(ndr, 5)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_MonitorInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- case 2: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_MonitorInfo2(ndr, NDR_SCALARS, &r->info2)); >- break; } >+ case 2: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_MonitorInfo2(ndr, NDR_SCALARS, &r->info2)); >+ break; } > >- default: { >- break; } >+ default: { >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- NDR_CHECK(ndr_push_spoolss_MonitorInfo1(ndr, NDR_BUFFERS, &r->info1)); >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ NDR_CHECK(ndr_push_spoolss_MonitorInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; > >- case 2: >- NDR_CHECK(ndr_push_spoolss_MonitorInfo2(ndr, NDR_BUFFERS, &r->info2)); >- break; >+ case 2: >+ NDR_CHECK(ndr_push_spoolss_MonitorInfo2(ndr, NDR_BUFFERS, &r->info2)); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -17705,42 +18036,47 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_MonitorInfo(struct ndr_pull *ndr, in > { > uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr); > int level; >- level = ndr_pull_get_switch_value(ndr, r); >- if (ndr_flags & NDR_SCALARS) { >- NDR_CHECK(ndr_pull_union_align(ndr, 5)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_MonitorInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_pull_get_switch_value(ndr, r); >+ if (ndr_flags & NDR_SCALARS) { >+ NDR_CHECK(ndr_pull_union_align(ndr, 5)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_MonitorInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- case 2: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_MonitorInfo2(ndr, NDR_SCALARS, &r->info2)); >- break; } >+ case 2: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_MonitorInfo2(ndr, NDR_SCALARS, &r->info2)); >+ break; } > >- default: { >- break; } >+ default: { >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- NDR_CHECK(ndr_pull_spoolss_MonitorInfo1(ndr, NDR_BUFFERS, &r->info1)); >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ NDR_CHECK(ndr_pull_spoolss_MonitorInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; > >- case 2: >- NDR_CHECK(ndr_pull_spoolss_MonitorInfo2(ndr, NDR_BUFFERS, &r->info2)); >- break; >+ case 2: >+ NDR_CHECK(ndr_pull_spoolss_MonitorInfo2(ndr, NDR_BUFFERS, &r->info2)); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -17749,20 +18085,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_MonitorInfo(struct ndr_pull *ndr, in > _PUBLIC_ void ndr_print_spoolss_MonitorInfo(struct ndr_print *ndr, const char *name, const union spoolss_MonitorInfo *r) > { > int level; >- level = ndr_print_get_switch_value(ndr, r); >- ndr_print_union(ndr, name, level, "spoolss_MonitorInfo"); >- switch (level) { >- case 1: >- ndr_print_spoolss_MonitorInfo1(ndr, "info1", &r->info1); >- break; >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_print_get_switch_value(ndr, r); >+ ndr_print_union(ndr, name, level, "spoolss_MonitorInfo"); >+ switch (level) { >+ case 1: >+ ndr_print_spoolss_MonitorInfo1(ndr, "info1", &r->info1); >+ break; > >- case 2: >- ndr_print_spoolss_MonitorInfo2(ndr, "info2", &r->info2); >- break; >+ case 2: >+ ndr_print_spoolss_MonitorInfo2(ndr, "info2", &r->info2); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } >+ ndr->flags = _flags_save_UNION; > } > } > >@@ -17854,33 +18195,38 @@ _PUBLIC_ size_t ndr_size_spoolss_PrintProcDataTypesInfo1(const struct spoolss_Pr > _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrintProcDataTypesInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_PrintProcDataTypesInfo *r) > { > uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr); >- if (ndr_flags & NDR_SCALARS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_union_align(ndr, 5)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_push_spoolss_PrintProcDataTypesInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ if (ndr_flags & NDR_SCALARS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_union_align(ndr, 5)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_push_spoolss_PrintProcDataTypesInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- default: { >- break; } >+ default: { >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- int level = ndr_push_get_switch_value(ndr, r); >- NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- NDR_CHECK(ndr_push_spoolss_PrintProcDataTypesInfo1(ndr, NDR_BUFFERS, &r->info1)); >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ int level = ndr_push_get_switch_value(ndr, r); >+ NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ NDR_CHECK(ndr_push_spoolss_PrintProcDataTypesInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -17890,32 +18236,37 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcDataTypesInfo(struct ndr_pu > { > uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr); > int level; >- level = ndr_pull_get_switch_value(ndr, r); >- if (ndr_flags & NDR_SCALARS) { >- NDR_CHECK(ndr_pull_union_align(ndr, 5)); >- switch (level) { >- case 1: { >- NDR_CHECK(ndr_pull_align(ndr, 5)); >- NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >- NDR_CHECK(ndr_pull_spoolss_PrintProcDataTypesInfo1(ndr, NDR_SCALARS, &r->info1)); >- break; } >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_pull_get_switch_value(ndr, r); >+ if (ndr_flags & NDR_SCALARS) { >+ NDR_CHECK(ndr_pull_union_align(ndr, 5)); >+ switch (level) { >+ case 1: { >+ NDR_CHECK(ndr_pull_align(ndr, 5)); >+ NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); >+ NDR_CHECK(ndr_pull_spoolss_PrintProcDataTypesInfo1(ndr, NDR_SCALARS, &r->info1)); >+ break; } > >- default: { >- break; } >+ default: { >+ break; } > >+ } > } >- } >- if (ndr_flags & NDR_BUFFERS) { >- NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >- switch (level) { >- case 1: >- NDR_CHECK(ndr_pull_spoolss_PrintProcDataTypesInfo1(ndr, NDR_BUFFERS, &r->info1)); >- break; >+ if (ndr_flags & NDR_BUFFERS) { >+ NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); >+ switch (level) { >+ case 1: >+ NDR_CHECK(ndr_pull_spoolss_PrintProcDataTypesInfo1(ndr, NDR_BUFFERS, &r->info1)); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } > } >+ ndr->flags = _flags_save_UNION; > } > ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset); > return NDR_ERR_SUCCESS; >@@ -17924,16 +18275,21 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcDataTypesInfo(struct ndr_pu > _PUBLIC_ void ndr_print_spoolss_PrintProcDataTypesInfo(struct ndr_print *ndr, const char *name, const union spoolss_PrintProcDataTypesInfo *r) > { > int level; >- level = ndr_print_get_switch_value(ndr, r); >- ndr_print_union(ndr, name, level, "spoolss_PrintProcDataTypesInfo"); >- switch (level) { >- case 1: >- ndr_print_spoolss_PrintProcDataTypesInfo1(ndr, "info1", &r->info1); >- break; >+ { >+ uint32_t _flags_save_UNION = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE); >+ level = ndr_print_get_switch_value(ndr, r); >+ ndr_print_union(ndr, name, level, "spoolss_PrintProcDataTypesInfo"); >+ switch (level) { >+ case 1: >+ ndr_print_spoolss_PrintProcDataTypesInfo1(ndr, "info1", &r->info1); >+ break; > >- default: >- break; >+ default: >+ break; > >+ } >+ ndr->flags = _flags_save_UNION; > } > } > >diff --git a/librpc/gen_ndr/ndr_spoolss.h b/librpc/gen_ndr/ndr_spoolss.h >index ee74c78..0591980 100644 >--- a/librpc/gen_ndr/ndr_spoolss.h >+++ b/librpc/gen_ndr/ndr_spoolss.h >@@ -239,6 +239,8 @@ void ndr_print_spoolss_ProcessorArchitecture(struct ndr_print *ndr, const char * > void ndr_print_spoolss_ProcessorType(struct ndr_print *ndr, const char *name, enum spoolss_ProcessorType r); > void ndr_print_spoolss_MajorVersion(struct ndr_print *ndr, const char *name, enum spoolss_MajorVersion r); > void ndr_print_spoolss_MinorVersion(struct ndr_print *ndr, const char *name, enum spoolss_MinorVersion r); >+enum ndr_err_code ndr_push_spoolss_PrinterStatus(struct ndr_push *ndr, int ndr_flags, uint32_t r); >+enum ndr_err_code ndr_pull_spoolss_PrinterStatus(struct ndr_pull *ndr, int ndr_flags, uint32_t *r); > void ndr_print_spoolss_PrinterStatus(struct ndr_print *ndr, const char *name, uint32_t r); > void ndr_print_spoolss_JobStatus(struct ndr_print *ndr, const char *name, uint32_t r); > enum ndr_err_code ndr_push_spoolss_PrinterInfo0(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo0 *r); >@@ -267,6 +269,8 @@ size_t ndr_size_spoolss_DeviceMode(const struct spoolss_DeviceMode *r, struct sm > enum ndr_err_code ndr_push_spoolss_EnumPrinterFlags(struct ndr_push *ndr, int ndr_flags, uint32_t r); > enum ndr_err_code ndr_pull_spoolss_EnumPrinterFlags(struct ndr_pull *ndr, int ndr_flags, uint32_t *r); > void ndr_print_spoolss_EnumPrinterFlags(struct ndr_print *ndr, const char *name, uint32_t r); >+enum ndr_err_code ndr_push_spoolss_PrinterAttributes(struct ndr_push *ndr, int ndr_flags, uint32_t r); >+enum ndr_err_code ndr_pull_spoolss_PrinterAttributes(struct ndr_pull *ndr, int ndr_flags, uint32_t *r); > void ndr_print_spoolss_PrinterAttributes(struct ndr_print *ndr, const char *name, uint32_t r); > enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo1 *r); > enum ndr_err_code ndr_pull_spoolss_PrinterInfo1(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo1 *r); >diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h >index 08d1a38..5f5c537 100644 >--- a/librpc/gen_ndr/spoolss.h >+++ b/librpc/gen_ndr/spoolss.h >@@ -816,12 +816,12 @@ struct spoolss_PrinterInfo2 { > const char * drivername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ > const char * comment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ > const char * location;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0)] */ >+ struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > const char * sepfile;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ > const char * printprocessor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ > const char * datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ > const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- struct security_descriptor *secdesc;/* [relative,subcontext(0)] */ >+ struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > uint32_t attributes; > uint32_t priority;/* [range(0,99)] */ > uint32_t defaultpriority; >@@ -833,7 +833,7 @@ struct spoolss_PrinterInfo2 { > }/* [gensize,public] */; > > struct spoolss_PrinterInfo3 { >- struct security_descriptor *secdesc;/* [relative,subcontext(0)] */ >+ struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > }/* [gensize,public] */; > > struct spoolss_PrinterInfo4 { >@@ -867,7 +867,7 @@ struct spoolss_PrinterInfo7 { > }/* [gensize,public] */; > > struct spoolss_DeviceModeInfo { >- struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0)] */ >+ struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > }; > > union spoolss_PrinterInfo { >@@ -881,7 +881,7 @@ union spoolss_PrinterInfo { > struct spoolss_PrinterInfo7 info7;/* [case(7)] */ > struct spoolss_DeviceModeInfo info8;/* [case(8)] */ > struct spoolss_DeviceModeInfo info9;/* [case(9)] */ >-}/* [relative_base,gensize,public,nodiscriminant] */; >+}/* [gensize,relative_base,nodiscriminant,public,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */; > > struct spoolss_DevmodeContainer { > uint32_t _ndr_size;/* [value(_ndr_size_spoolss_DeviceMode(devmode,ndr->iconv_convenience,ndr->flags))] */ >@@ -915,9 +915,9 @@ struct spoolss_JobInfo2 { > const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ > const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ > const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- struct spoolss_DeviceMode *devmode;/* [relative] */ >+ struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- struct security_descriptor *secdesc;/* [relative] */ >+ struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > uint32_t status; > uint32_t priority;/* [range(0,99)] */ > uint32_t position; >@@ -947,9 +947,9 @@ struct spoolss_JobInfo4 { > const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ > const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ > const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- struct spoolss_DeviceMode *devmode;/* [relative] */ >+ struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- struct security_descriptor *secdesc;/* [relative] */ >+ struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > uint32_t status; > uint32_t priority;/* [range(0,99)] */ > uint32_t position; >@@ -968,7 +968,7 @@ union spoolss_JobInfo { > struct spoolss_JobInfo2 info2;/* [case(2)] */ > struct spoolss_JobInfo3 info3;/* [case(3)] */ > struct spoolss_JobInfo4 info4;/* [case(4)] */ >-}/* [relative_base,gensize,public,nodiscriminant] */; >+}/* [gensize,relative_base,nodiscriminant,public,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */; > > struct spoolss_SetJobInfo1 { > uint32_t job_id; >@@ -1521,7 +1521,7 @@ union spoolss_DriverInfo { > struct spoolss_DriverInfo7 info7;/* [case(7)] */ > struct spoolss_DriverInfo8 info8;/* [case(8)] */ > struct spoolss_DriverInfo101 info101;/* [case(101)] */ >-}/* [relative_base,gensize,public,nodiscriminant] */; >+}/* [gensize,relative_base,nodiscriminant,public,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */; > > struct spoolss_DriverDirectoryInfo1 { > const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >@@ -1529,7 +1529,7 @@ struct spoolss_DriverDirectoryInfo1 { > > union spoolss_DriverDirectoryInfo { > struct spoolss_DriverDirectoryInfo1 info1;/* [case] */ >-}/* [gensize,relative_base,nodiscriminant,public] */; >+}/* [gensize,relative_base,nodiscriminant,public,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */; > > struct spoolss_PrintProcessorInfo1 { > const char * print_processor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >@@ -1537,7 +1537,7 @@ struct spoolss_PrintProcessorInfo1 { > > union spoolss_PrintProcessorInfo { > struct spoolss_PrintProcessorInfo1 info1;/* [case] */ >-}/* [relative_base,nodiscriminant,public] */; >+}/* [relative_base,public,nodiscriminant,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */; > > struct spoolss_PrintProcessorDirectoryInfo1 { > const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >@@ -1545,7 +1545,7 @@ struct spoolss_PrintProcessorDirectoryInfo1 { > > union spoolss_PrintProcessorDirectoryInfo { > struct spoolss_PrintProcessorDirectoryInfo1 info1;/* [case] */ >-}/* [gensize,relative_base,nodiscriminant,public] */; >+}/* [gensize,relative_base,nodiscriminant,public,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */; > > struct spoolss_DocumentInfo1 { > const char *document_name;/* [unique,charset(UTF16)] */ >@@ -1644,7 +1644,7 @@ struct spoolss_FormInfo2 { > union spoolss_FormInfo { > struct spoolss_FormInfo1 info1;/* [case] */ > struct spoolss_FormInfo2 info2;/* [case(2)] */ >-}/* [relative_base,gensize,public,nodiscriminant] */; >+}/* [gensize,relative_base,nodiscriminant,public,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */; > > struct spoolss_AddFormInfo1 { > enum spoolss_FormFlags flags; >@@ -1755,7 +1755,7 @@ union spoolss_PortInfo { > struct spoolss_PortInfo2 info2;/* [case(2)] */ > struct spoolss_PortInfo3 info3;/* [case(3)] */ > struct spoolss_PortInfoFF infoFF;/* [case(0xff)] */ >-}/* [relative_base,nodiscriminant,public] */; >+}/* [relative_base,public,nodiscriminant,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */; > > struct spoolss_MonitorInfo1 { > const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >@@ -1770,7 +1770,7 @@ struct spoolss_MonitorInfo2 { > union spoolss_MonitorInfo { > struct spoolss_MonitorInfo1 info1;/* [case] */ > struct spoolss_MonitorInfo2 info2;/* [case(2)] */ >-}/* [relative_base,nodiscriminant,public] */; >+}/* [relative_base,public,nodiscriminant,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */; > > struct spoolss_PrintProcDataTypesInfo1 { > const char * name_array;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >@@ -1778,7 +1778,7 @@ struct spoolss_PrintProcDataTypesInfo1 { > > union spoolss_PrintProcDataTypesInfo { > struct spoolss_PrintProcDataTypesInfo1 info1;/* [case] */ >-}/* [relative_base,nodiscriminant,public] */; >+}/* [relative_base,public,nodiscriminant,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */; > > /* bitmap spoolss_PrinterChangeFlags */ > #define PRINTER_CHANGE_ADD_PRINTER ( 0x00000001 ) >-- >1.6.6 > > >From 25ccd544920649065ed20a18bd9d60d0af7cbde0 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Tue, 16 Feb 2010 02:48:01 +0100 >Subject: [PATCH 23/24] spoolss: add spoolss_security_descriptor. > >Guenther >(cherry picked from commit 28817424935e5b6eaf465fe993dedc2b0a0cf177) >--- > librpc/gen_ndr/ndr_spoolss.c | 88 +++++++++++++++++++++--------------------- > librpc/gen_ndr/spoolss.h | 9 ++-- > librpc/idl/spoolss.idl | 11 +++-- > librpc/ndr/ndr_spoolss_buf.c | 56 ++++++++++++++++++++++++++ > librpc/ndr/ndr_spoolss_buf.h | 3 + > 5 files changed, 115 insertions(+), 52 deletions(-) > >diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c >index dadb3e3..f0efef7 100644 >--- a/librpc/gen_ndr/ndr_spoolss.c >+++ b/librpc/gen_ndr/ndr_spoolss.c >@@ -1546,10 +1546,10 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > ndr->flags = _flags_save_string; > } > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > NDR_CHECK(ndr_push_spoolss_PrinterAttributes(ndr, NDR_SCALARS, r->attributes)); > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->priority)); >@@ -1688,19 +1688,19 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > ndr->flags = _flags_save_string; > } > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > if (r->secdesc) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); > { > struct ndr_push *_ndr_secdesc; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >- NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_push_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); > } > NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); > } >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -1881,7 +1881,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > ndr->flags = _flags_save_string; > } > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); > if (_ptr_secdesc) { >@@ -1890,7 +1890,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } else { > r->secdesc = NULL; > } >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > NDR_CHECK(ndr_pull_spoolss_PrinterAttributes(ndr, NDR_SCALARS, &r->attributes)); > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->priority)); >@@ -2092,7 +2092,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > ndr->flags = _flags_save_string; > } > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > if (r->secdesc) { > uint32_t _relative_save_offset; >@@ -2103,13 +2103,13 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > { > struct ndr_pull *_ndr_secdesc; > NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >- NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_pull_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); > NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1)); > } > NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); > ndr->offset = _relative_save_offset; > } >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -2194,7 +2194,7 @@ _PUBLIC_ void ndr_print_spoolss_PrinterInfo2(struct ndr_print *ndr, const char * > ndr_print_ptr(ndr, "secdesc", r->secdesc); > ndr->depth++; > if (r->secdesc) { >- ndr_print_security_descriptor(ndr, "secdesc", r->secdesc); >+ ndr_print_spoolss_security_descriptor(ndr, "secdesc", r->secdesc); > } > ndr->depth--; > ndr_print_spoolss_PrinterAttributes(ndr, "attributes", r->attributes); >@@ -2218,28 +2218,28 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo3(struct ndr_push *ndr, i > if (ndr_flags & NDR_SCALARS) { > NDR_CHECK(ndr_push_align(ndr, 5)); > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > NDR_CHECK(ndr_push_trailer_align(ndr, 5)); > } > if (ndr_flags & NDR_BUFFERS) { > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > if (r->secdesc) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); > { > struct ndr_push *_ndr_secdesc; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >- NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_push_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); > } > NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); > } >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -2252,7 +2252,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo3(struct ndr_pull *ndr, i > if (ndr_flags & NDR_SCALARS) { > NDR_CHECK(ndr_pull_align(ndr, 5)); > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); > if (_ptr_secdesc) { >@@ -2261,13 +2261,13 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo3(struct ndr_pull *ndr, i > } else { > r->secdesc = NULL; > } >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > NDR_CHECK(ndr_pull_trailer_align(ndr, 5)); > } > if (ndr_flags & NDR_BUFFERS) { > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > if (r->secdesc) { > uint32_t _relative_save_offset; >@@ -2278,13 +2278,13 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo3(struct ndr_pull *ndr, i > { > struct ndr_pull *_ndr_secdesc; > NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >- NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_pull_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); > NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1)); > } > NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); > ndr->offset = _relative_save_offset; > } >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -2297,7 +2297,7 @@ _PUBLIC_ void ndr_print_spoolss_PrinterInfo3(struct ndr_print *ndr, const char * > ndr_print_ptr(ndr, "secdesc", r->secdesc); > ndr->depth++; > if (r->secdesc) { >- ndr_print_security_descriptor(ndr, "secdesc", r->secdesc); >+ ndr_print_spoolss_security_descriptor(ndr, "secdesc", r->secdesc); > } > ndr->depth--; > ndr->depth--; >@@ -3656,10 +3656,10 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > ndr->flags = _flags_save_string; > } > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > NDR_CHECK(ndr_push_spoolss_JobStatus(ndr, NDR_SCALARS, r->status)); > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->priority)); >@@ -3790,19 +3790,19 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > ndr->flags = _flags_save_string; > } > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > if (r->secdesc) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); > { > struct ndr_push *_ndr_secdesc; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >- NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_push_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); > } > NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); > } >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -3970,7 +3970,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > ndr->flags = _flags_save_string; > } > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); > if (_ptr_secdesc) { >@@ -3979,7 +3979,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } else { > r->secdesc = NULL; > } >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > NDR_CHECK(ndr_pull_spoolss_JobStatus(ndr, NDR_SCALARS, &r->status)); > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->priority)); >@@ -4168,7 +4168,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > ndr->flags = _flags_save_string; > } > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > if (r->secdesc) { > uint32_t _relative_save_offset; >@@ -4179,13 +4179,13 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > { > struct ndr_pull *_ndr_secdesc; > NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >- NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_pull_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); > NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1)); > } > NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); > ndr->offset = _relative_save_offset; > } >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -4265,7 +4265,7 @@ _PUBLIC_ void ndr_print_spoolss_JobInfo2(struct ndr_print *ndr, const char *name > ndr_print_ptr(ndr, "secdesc", r->secdesc); > ndr->depth++; > if (r->secdesc) { >- ndr_print_security_descriptor(ndr, "secdesc", r->secdesc); >+ ndr_print_spoolss_security_descriptor(ndr, "secdesc", r->secdesc); > } > ndr->depth--; > ndr_print_spoolss_JobStatus(ndr, "status", r->status); >@@ -4401,10 +4401,10 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > ndr->flags = _flags_save_string; > } > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > NDR_CHECK(ndr_push_spoolss_JobStatus(ndr, NDR_SCALARS, r->status)); > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->priority)); >@@ -4536,19 +4536,19 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > ndr->flags = _flags_save_string; > } > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > if (r->secdesc) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); > { > struct ndr_push *_ndr_secdesc; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >- NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_push_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); > NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); > } > NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); > } >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -4716,7 +4716,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > ndr->flags = _flags_save_string; > } > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); > if (_ptr_secdesc) { >@@ -4725,7 +4725,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } else { > r->secdesc = NULL; > } >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > NDR_CHECK(ndr_pull_spoolss_JobStatus(ndr, NDR_SCALARS, &r->status)); > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->priority)); >@@ -4915,7 +4915,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > ndr->flags = _flags_save_string; > } > { >- uint32_t _flags_save_security_descriptor = ndr->flags; >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; > ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); > if (r->secdesc) { > uint32_t _relative_save_offset; >@@ -4926,13 +4926,13 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > { > struct ndr_pull *_ndr_secdesc; > NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >- NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_pull_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); > NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1)); > } > NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); > ndr->offset = _relative_save_offset; > } >- ndr->flags = _flags_save_security_descriptor; >+ ndr->flags = _flags_save_spoolss_security_descriptor; > } > } > return NDR_ERR_SUCCESS; >@@ -5012,7 +5012,7 @@ _PUBLIC_ void ndr_print_spoolss_JobInfo4(struct ndr_print *ndr, const char *name > ndr_print_ptr(ndr, "secdesc", r->secdesc); > ndr->depth++; > if (r->secdesc) { >- ndr_print_security_descriptor(ndr, "secdesc", r->secdesc); >+ ndr_print_spoolss_security_descriptor(ndr, "secdesc", r->secdesc); > } > ndr->depth--; > ndr_print_spoolss_JobStatus(ndr, "status", r->status); >diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h >index 5f5c537..7c69f57 100644 >--- a/librpc/gen_ndr/spoolss.h >+++ b/librpc/gen_ndr/spoolss.h >@@ -7,6 +7,7 @@ > #include "librpc/gen_ndr/misc.h" > #include "librpc/gen_ndr/security.h" > #include "librpc/gen_ndr/winreg.h" >+#define spoolss_security_descriptor security_descriptor > #ifndef _HEADER_spoolss > #define _HEADER_spoolss > >@@ -821,7 +822,7 @@ struct spoolss_PrinterInfo2 { > const char * printprocessor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ > const char * datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ > const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ >+ struct spoolss_security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > uint32_t attributes; > uint32_t priority;/* [range(0,99)] */ > uint32_t defaultpriority; >@@ -833,7 +834,7 @@ struct spoolss_PrinterInfo2 { > }/* [gensize,public] */; > > struct spoolss_PrinterInfo3 { >- struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ >+ struct spoolss_security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > }/* [gensize,public] */; > > struct spoolss_PrinterInfo4 { >@@ -917,7 +918,7 @@ struct spoolss_JobInfo2 { > const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ > struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ >+ struct spoolss_security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > uint32_t status; > uint32_t priority;/* [range(0,99)] */ > uint32_t position; >@@ -949,7 +950,7 @@ struct spoolss_JobInfo4 { > const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ > struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ >+ struct spoolss_security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > uint32_t status; > uint32_t priority;/* [range(0,99)] */ > uint32_t position; >diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl >index 3365ea3..4816209 100644 >--- a/librpc/idl/spoolss.idl >+++ b/librpc/idl/spoolss.idl >@@ -5,6 +5,9 @@ > */ > import "misc.idl", "security.idl", "winreg.idl"; > >+ >+cpp_quote("#define spoolss_security_descriptor security_descriptor") >+ > [ uuid("12345678-1234-abcd-ef00-0123456789ab"), > version(1.0), > endpoint("ncacn_np:[\\pipe\\spoolss]"), >@@ -478,7 +481,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > [relative] nstring *printprocessor; > [relative] nstring *datatype; > [relative] nstring *parameters; >- [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; >+ [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_security_descriptor *secdesc; > spoolss_PrinterAttributes attributes; > [range(0,99)] uint32 priority; > uint32 defaultpriority; >@@ -490,7 +493,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > } spoolss_PrinterInfo2; > > typedef [public,gensize] struct { >- [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; >+ [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_security_descriptor *secdesc; > } spoolss_PrinterInfo3; > > typedef [public,gensize] struct { >@@ -621,7 +624,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > [relative] nstring *driver_name; > [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode; > [relative] nstring *text_status; >- [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; >+ [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_security_descriptor *secdesc; > spoolss_JobStatus status; > [range(0,99)] uint32 priority; > uint32 position; >@@ -653,7 +656,7 @@ import "misc.idl", "security.idl", "winreg.idl"; > [relative] nstring *driver_name; > [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode; > [relative] nstring *text_status; >- [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; >+ [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_security_descriptor *secdesc; > spoolss_JobStatus status; > [range(0,99)] uint32 priority; > uint32 position; >diff --git a/librpc/ndr/ndr_spoolss_buf.c b/librpc/ndr/ndr_spoolss_buf.c >index e6c0acf..788b20a 100644 >--- a/librpc/ndr/ndr_spoolss_buf.c >+++ b/librpc/ndr/ndr_spoolss_buf.c >@@ -24,6 +24,7 @@ > > #include "includes.h" > #include "librpc/gen_ndr/ndr_spoolss.h" >+#include "librpc/gen_ndr/ndr_security.h" > #if (_SAMBA_BUILD_ >= 4) > #include "param/param.h" > #endif >@@ -1376,3 +1377,58 @@ _PUBLIC_ size_t ndr_size_spoolss_PrinterData(const union spoolss_PrinterData *r, > return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterData, ic); > } > >+void ndr_print_spoolss_security_descriptor(struct ndr_print *ndr, const char *name, const struct security_descriptor *r) >+{ >+ ndr_print_security_descriptor(ndr, name, r); >+} >+ >+enum ndr_err_code ndr_pull_spoolss_security_descriptor(struct ndr_pull *ndr, int ndr_flags, struct security_descriptor *r) >+{ >+ uint32_t _flags_save_STRUCT = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NO_RELATIVE_REVERSE); >+ NDR_CHECK(ndr_pull_security_descriptor(ndr, ndr_flags, r)); >+ ndr->flags = _flags_save_STRUCT; >+ return NDR_ERR_SUCCESS; >+} >+ >+enum ndr_err_code ndr_push_spoolss_security_descriptor(struct ndr_push *ndr, int ndr_flags, const struct security_descriptor *r) >+{ >+ { >+ uint32_t _flags_save_STRUCT = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_LITTLE_ENDIAN|LIBNDR_FLAG_NO_RELATIVE_REVERSE); >+ if (ndr_flags & NDR_SCALARS) { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ NDR_CHECK(ndr_push_security_descriptor_revision(ndr, NDR_SCALARS, r->revision)); >+ NDR_CHECK(ndr_push_security_descriptor_type(ndr, NDR_SCALARS, r->type)); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->owner_sid)); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->group_sid)); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->sacl)); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->dacl)); >+ NDR_CHECK(ndr_push_trailer_align(ndr, 5)); >+ } >+ if (ndr_flags & NDR_BUFFERS) { >+ if (r->sacl) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->sacl)); >+ NDR_CHECK(ndr_push_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->sacl)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->sacl)); >+ } >+ if (r->dacl) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dacl)); >+ NDR_CHECK(ndr_push_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->dacl)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->dacl)); >+ } >+ if (r->owner_sid) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->owner_sid)); >+ NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, r->owner_sid)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->owner_sid)); >+ } >+ if (r->group_sid) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->group_sid)); >+ NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, r->group_sid)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->group_sid)); >+ } >+ } >+ ndr->flags = _flags_save_STRUCT; >+ } >+ return NDR_ERR_SUCCESS; >+} >diff --git a/librpc/ndr/ndr_spoolss_buf.h b/librpc/ndr/ndr_spoolss_buf.h >index a53ab7b..948e910 100644 >--- a/librpc/ndr/ndr_spoolss_buf.h >+++ b/librpc/ndr/ndr_spoolss_buf.h >@@ -54,6 +54,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo101(struct ndr_push *ndr, > _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo101(struct ndr_pull *ndr, int ndr_flags, struct spoolss_DriverInfo101 *r); > void ndr_print_spoolss_Field(struct ndr_print *ndr, const char *name, const union spoolss_Field *r); > size_t ndr_size_spoolss_PrinterData(const union spoolss_PrinterData *r, uint32_t level, struct smb_iconv_convenience *ic, int flags); >+void ndr_print_spoolss_security_descriptor(struct ndr_print *ndr, const char *name, const struct security_descriptor *r); >+enum ndr_err_code ndr_pull_spoolss_security_descriptor(struct ndr_pull *ndr, int ndr_flags, struct security_descriptor *r); >+enum ndr_err_code ndr_push_spoolss_security_descriptor(struct ndr_push *ndr, int ndr_flags, const struct security_descriptor *r); > > #undef _PRINTF_ATTRIBUTE > #define _PRINTF_ATTRIBUTE(a1, a2) >-- >1.6.6 > > >From 1ec67d10a3188172b699668bb807a20df0b46e75 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Sat, 13 Feb 2010 03:45:25 +0100 >Subject: [PATCH 24/24] spoolss: use ndr_push_spoolss_PrinterInfo2 hand-marshalled version (moves devmode relative pointer down to sd). > >Guenther >(cherry picked from commit 0a8011aa98ccaa81dc6ba2d30672ef4856fc31d8) >--- > librpc/gen_ndr/ndr_spoolss.c | 237 ------------------------------------------ > librpc/gen_ndr/spoolss.h | 2 +- > librpc/idl/spoolss.idl | 2 +- > librpc/ndr/ndr_spoolss_buf.c | 237 ++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 239 insertions(+), 239 deletions(-) > >diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c >index f0efef7..fe74901 100644 >--- a/librpc/gen_ndr/ndr_spoolss.c >+++ b/librpc/gen_ndr/ndr_spoolss.c >@@ -1469,243 +1469,6 @@ _PUBLIC_ size_t ndr_size_spoolss_PrinterInfo1(const struct spoolss_PrinterInfo1 > return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo1, ic); > } > >-_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo2 *r) >-{ >- if (ndr_flags & NDR_SCALARS) { >- NDR_CHECK(ndr_push_align(ndr, 5)); >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->servername)); >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->printername)); >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->sharename)); >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->portname)); >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->drivername)); >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->comment)); >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->location)); >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->devmode)); >- ndr->flags = _flags_save_spoolss_DeviceMode; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->sepfile)); >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->printprocessor)); >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->datatype)); >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->parameters)); >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >- NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); >- ndr->flags = _flags_save_spoolss_security_descriptor; >- } >- NDR_CHECK(ndr_push_spoolss_PrinterAttributes(ndr, NDR_SCALARS, r->attributes)); >- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->priority)); >- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->defaultpriority)); >- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->starttime)); >- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->untiltime)); >- NDR_CHECK(ndr_push_spoolss_PrinterStatus(ndr, NDR_SCALARS, r->status)); >- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->cjobs)); >- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->averageppm)); >- NDR_CHECK(ndr_push_trailer_align(ndr, 5)); >- } >- if (ndr_flags & NDR_BUFFERS) { >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- if (r->servername) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->servername)); >- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->servername)); >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->servername)); >- } >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- if (r->printername) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printername)); >- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printername)); >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->printername)); >- } >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- if (r->sharename) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->sharename)); >- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->sharename)); >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->sharename)); >- } >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- if (r->portname) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->portname)); >- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->portname)); >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->portname)); >- } >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- if (r->drivername) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->drivername)); >- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->drivername)); >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->drivername)); >- } >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- if (r->comment) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->comment)); >- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->comment)); >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->comment)); >- } >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- if (r->location) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->location)); >- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->location)); >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->location)); >- } >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >- if (r->devmode) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode)); >- { >- struct ndr_push *_ndr_devmode; >- NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_devmode, 0, -1)); >- NDR_CHECK(ndr_push_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); >- NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_devmode, 0, -1)); >- } >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode)); >- } >- ndr->flags = _flags_save_spoolss_DeviceMode; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- if (r->sepfile) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->sepfile)); >- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->sepfile)); >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->sepfile)); >- } >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- if (r->printprocessor) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printprocessor)); >- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printprocessor)); >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->printprocessor)); >- } >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- if (r->datatype) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->datatype)); >- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->datatype)); >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->datatype)); >- } >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >- if (r->parameters) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->parameters)); >- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->parameters)); >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->parameters)); >- } >- ndr->flags = _flags_save_string; >- } >- { >- uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >- if (r->secdesc) { >- NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); >- { >- struct ndr_push *_ndr_secdesc; >- NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >- NDR_CHECK(ndr_push_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >- NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); >- } >- NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); >- } >- ndr->flags = _flags_save_spoolss_security_descriptor; >- } >- } >- return NDR_ERR_SUCCESS; >-} >- > _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo2 *r) > { > uint32_t _ptr_servername; >diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h >index 7c69f57..945453c 100644 >--- a/librpc/gen_ndr/spoolss.h >+++ b/librpc/gen_ndr/spoolss.h >@@ -831,7 +831,7 @@ struct spoolss_PrinterInfo2 { > uint32_t status; > uint32_t cjobs; > uint32_t averageppm; >-}/* [gensize,public] */; >+}/* [gensize,public,nopush] */; > > struct spoolss_PrinterInfo3 { > struct spoolss_security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ >diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl >index 4816209..377ef5e 100644 >--- a/librpc/idl/spoolss.idl >+++ b/librpc/idl/spoolss.idl >@@ -468,7 +468,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") > [relative] nstring *comment; > } spoolss_PrinterInfo1; > >- typedef [public,gensize] struct { >+ typedef [public,gensize,nopush] struct { > [relative] nstring *servername; > [relative] nstring *printername; > [relative] nstring *sharename; >diff --git a/librpc/ndr/ndr_spoolss_buf.c b/librpc/ndr/ndr_spoolss_buf.c >index 788b20a..8d977c8 100644 >--- a/librpc/ndr/ndr_spoolss_buf.c >+++ b/librpc/ndr/ndr_spoolss_buf.c >@@ -1432,3 +1432,240 @@ enum ndr_err_code ndr_push_spoolss_security_descriptor(struct ndr_push *ndr, int > } > return NDR_ERR_SUCCESS; > } >+ >+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo2 *r) >+{ >+ if (ndr_flags & NDR_SCALARS) { >+ NDR_CHECK(ndr_push_align(ndr, 5)); >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->servername)); >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->printername)); >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->sharename)); >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->portname)); >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->drivername)); >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->comment)); >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->location)); >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->devmode)); >+ ndr->flags = _flags_save_spoolss_DeviceMode; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->sepfile)); >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->printprocessor)); >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->datatype)); >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->parameters)); >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); >+ ndr->flags = _flags_save_spoolss_security_descriptor; >+ } >+ NDR_CHECK(ndr_push_spoolss_PrinterAttributes(ndr, NDR_SCALARS, r->attributes)); >+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->priority)); >+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->defaultpriority)); >+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->starttime)); >+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->untiltime)); >+ NDR_CHECK(ndr_push_spoolss_PrinterStatus(ndr, NDR_SCALARS, r->status)); >+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->cjobs)); >+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->averageppm)); >+ NDR_CHECK(ndr_push_trailer_align(ndr, 5)); >+ } >+ if (ndr_flags & NDR_BUFFERS) { >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ if (r->servername) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->servername)); >+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->servername)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->servername)); >+ } >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ if (r->printername) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printername)); >+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printername)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->printername)); >+ } >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ if (r->sharename) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->sharename)); >+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->sharename)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->sharename)); >+ } >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ if (r->portname) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->portname)); >+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->portname)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->portname)); >+ } >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ if (r->drivername) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->drivername)); >+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->drivername)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->drivername)); >+ } >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ if (r->comment) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->comment)); >+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->comment)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->comment)); >+ } >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ if (r->location) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->location)); >+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->location)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->location)); >+ } >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ if (r->sepfile) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->sepfile)); >+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->sepfile)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->sepfile)); >+ } >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ if (r->printprocessor) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printprocessor)); >+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printprocessor)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->printprocessor)); >+ } >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ if (r->datatype) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->datatype)); >+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->datatype)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->datatype)); >+ } >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_string = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ if (r->parameters) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->parameters)); >+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->parameters)); >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->parameters)); >+ } >+ ndr->flags = _flags_save_string; >+ } >+ { >+ uint32_t _flags_save_spoolss_DeviceMode = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->devmode) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode)); >+ { >+ struct ndr_push *_ndr_devmode; >+ NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_devmode, 0, -1)); >+ NDR_CHECK(ndr_push_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode)); >+ NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_devmode, 0, -1)); >+ } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode)); >+ } >+ ndr->flags = _flags_save_spoolss_DeviceMode; >+ } >+ { >+ uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); >+ if (r->secdesc) { >+ NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); >+ { >+ struct ndr_push *_ndr_secdesc; >+ NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); >+ NDR_CHECK(ndr_push_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); >+ NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); >+ } >+ NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); >+ } >+ ndr->flags = _flags_save_spoolss_security_descriptor; >+ } >+ } >+ return NDR_ERR_SUCCESS; >+} >-- >1.6.6 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 6888
:
4940
|
4941
|
5382
|
5391
|
5392
|
5397
|
5398
|
7794