Changeset 745 for trunk/server/librpc/ndr/ndr_krb5pac.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• librpc/ndr/ndr_krb5pac.c (modified) (5 diffs)

trunk/server/librpc/ndr/ndr_krb5pac.c

@@ -24 +24 @@
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 
-static size_t _ndr_size_PAC_INFO(const union PAC_INFO *r, uint32_t level, struct smb_iconv_convenience *ic, int flags)
+static size_t _ndr_size_PAC_INFO(const union PAC_INFO *r, uint32_t level, int flags)
 {
-        size_t s = ndr_size_PAC_INFO(r, level, ic, flags);
+        size_t s = ndr_size_PAC_INFO(r, level, flags);
         switch (level) {
                 case PAC_TYPE_LOGON_INFO:
@@ -35 +35 @@
 }
 
-static size_t _subcontext_size_PAC_INFO(const union PAC_INFO *r, uint32_t level, struct smb_iconv_convenience *ic, int flags)
+static size_t _subcontext_size_PAC_INFO(const union PAC_INFO *r, uint32_t level, int flags)
 {
-        size_t s = ndr_size_PAC_INFO(r, level, ic, flags);
+        size_t s = ndr_size_PAC_INFO(r, level, flags);
         return NDR_ROUND(s,8);
 }
@@ -46 +46 @@
                 NDR_CHECK(ndr_push_align(ndr, 4));
                 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,ndr->iconv_convenience,0)));
+                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, _ndr_size_PAC_INFO(r->info,r->type,0)));
                 {
                         uint32_t _flags_save_PAC_INFO = ndr->flags;
@@ -63 +63 @@
                                 {
                                         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)));
+                                        NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_info, 0, _subcontext_size_PAC_INFO(r->info,r->type,0)));
                                         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, _subcontext_size_PAC_INFO(r->info,r->type,ndr->iconv_convenience,0)));
+                                        NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_info, 0, _subcontext_size_PAC_INFO(r->info,r->type,0)));
                                 }
                                 NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->info));
@@ -129 +129 @@
         ndr->depth++;
         ndr_print_PAC_TYPE(ndr, "type", r->type);
-        ndr_print_uint32(ndr, "_ndr_size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?_ndr_size_PAC_INFO(r->info,r->type,ndr->iconv_convenience,0):r->_ndr_size);
+        ndr_print_uint32(ndr, "_ndr_size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?_ndr_size_PAC_INFO(r->info,r->type,0):r->_ndr_size);
         ndr_print_ptr(ndr, "info", r->info);
         ndr->depth++;