diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-07-04 02:36:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:19:09 -0500 |
| commit | dbd2688c9042faaa44f4d89068a8351523233875 (patch) | |
| tree | 31cc633ae8f0f6a2437b3f726455548d9a6a051e /source4/build | |
| parent | 06348629b921adb6262e0f3d9a9c244568e2a78f (diff) | |
| download | samba-dbd2688c9042faaa44f4d89068a8351523233875.tar.gz samba-dbd2688c9042faaa44f4d89068a8351523233875.tar.bz2 samba-dbd2688c9042faaa44f4d89068a8351523233875.zip | |
r8110: More PAC work. I still can't get WinXP to accept the PAC, but we are
much closer.
This changes PIDL to allow a subcontext to have a pad8 flag, saying to
pad behind to an 8 byte boundary. This is the only way I can explain
the 4 trainling zeros in the signature struct.
Far more importantly, the PAC code is now under self-test, both in
creating/parsing our own PAC, but also a PAC from my win2k3 server.
This required changing auth_anonymous, because I wanted to reuse the
anonymous 'server_info' generation code.
I'm still having trouble with PIDL, particulary as surrounds value(),
but I'll follow up on the list.
Andrew Bartlett
(This used to be commit 50a54bf4e9bf04d2a8e0aebb3482a2ff655c8bbb)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/pidl/ndr.pm | 3 | ||||
| -rw-r--r-- | source4/build/pidl/ndr_parser.pm | 6 | ||||
| -rw-r--r-- | source4/build/pidl/validator.pm | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/source4/build/pidl/ndr.pm b/source4/build/pidl/ndr.pm index 2bf673b5e3..c4ff1d8a89 100644 --- a/source4/build/pidl/ndr.pm +++ b/source4/build/pidl/ndr.pm @@ -166,7 +166,8 @@ sub GetElementLevelTable($) SUBCONTEXT_SIZE => $subsize, IS_DEFERRED => $is_deferred, COMPRESSION => util::has_property($e, "compression"), - OBFUSCATION => util::has_property($e, "obfuscation") + OBFUSCATION => util::has_property($e, "obfuscation"), + PAD8 => util::has_property($e, "pad8") }); } diff --git a/source4/build/pidl/ndr_parser.pm b/source4/build/pidl/ndr_parser.pm index ba6b9d58da..48e243aa0c 100644 --- a/source4/build/pidl/ndr_parser.pm +++ b/source4/build/pidl/ndr_parser.pm @@ -452,6 +452,9 @@ sub ParseSubcontextPushEnd($$$$) pidl "NDR_CHECK(ndr_push_subcontext_header(ndr, $l->{HEADER_SIZE}, $subcontext_size, $ndr));"; pidl "NDR_CHECK(ndr_push_bytes(ndr, $ndr->data, $ndr->offset));"; + if (defined $l->{PAD8}) { + pidl "NDR_CHECK(ndr_push_align(ndr, 8));"; + } deindent; pidl "}"; } @@ -501,6 +504,9 @@ sub ParseSubcontextPullEnd($$$) $advance = "$ndr->offset"; } pidl "NDR_CHECK(ndr_pull_advance(ndr, $advance));"; + if (defined $l->{PAD8}) { + pidl "NDR_CHECK(ndr_pull_align(ndr, 8));"; + } deindent; pidl "}"; } diff --git a/source4/build/pidl/validator.pm b/source4/build/pidl/validator.pm index fbf7993b20..f1677d1ae7 100644 --- a/source4/build/pidl/validator.pm +++ b/source4/build/pidl/validator.pm @@ -106,6 +106,7 @@ my %property_list = ( "default" => ["ELEMENT"], # subcontext + "pad8" => ["ELEMENT"], "subcontext" => ["ELEMENT"], "subcontext_size" => ["ELEMENT"], "compression" => ["ELEMENT"], |