krb5pac: use autogenerated code for PAC_BUFFER push path.
authorGünther Deschner <gd@samba.org>
Mon, 18 Mar 2013 14:55:27 +0000 (15:55 +0100)
committerStefan Metzmacher <metze@samba.org>
Fri, 13 Mar 2015 11:05:24 +0000 (12:05 +0100)
commitac4a8e900386462b27d175f46663a1536896b9c3
tree4dfeceaa93130b7c69b60549050719165f5c6bc0
parente30096f1e5d8f4ead435721ea964c863d8d86c3f
krb5pac: use autogenerated code for PAC_BUFFER push path.

Guenther

This is the diff:

--- /tmp/ndr.c  2013-03-18 15:54:34.242654548 +0100
+++ /tmp/gen_ndr.c      2013-03-18 15:51:37.944338148 +0100
@@ -1,7 +1,8 @@
 _PUBLIC_ enum ndr_err_code ndr_push_PAC_BUFFER(struct ndr_push *ndr, int ndr_flags, const struct PAC_BUFFER *r)
 {
+       NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_PAC_TYPE(ndr, NDR_SCALARS, r->type));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, _ndr_size_PAC_INFO(r->info,r->type,0)));
                {
@@ -11,6 +12,7 @@
                        ndr->flags = _flags_save_PAC_INFO;
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_trailer_align(ndr, 5));
        }
        if (ndr_flags & NDR_BUFFERS) {
                {
@@ -20,10 +22,10 @@
                                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_subcontext_start(ndr, &_ndr_info, 0, NDR_ROUND(_ndr_size_PAC_INFO(r->info, r->type, 0), 8)));
                                        NDR_CHECK(ndr_push_set_switch_value(_ndr_info, r->info, r->type));
                                        NDR_CHECK(ndr_push_PAC_INFO(_ndr_info, NDR_SCALARS|NDR_BUFFERS, r->info));
-                                       NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_info, 0, NDR_ROUND(r->_ndr_size, 8)));
+                                       NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_info, 0, NDR_ROUND(_ndr_size_PAC_INFO(r->info, r->type, 0), 8)));
                                }
                                NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->info));
                        }

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
librpc/idl/krb5pac.idl
librpc/ndr/ndr_krb5pac.c
librpc/ndr/ndr_krb5pac.h [new file with mode: 0644]
librpc/wscript_build