Share ndr_krb5pac implementation.

diff --git a/source3/librpc/ndr/ndr_krb5pac.c b/librpc/ndr/ndr_krb5pac.c
similarity index 100%
rename from source3/librpc/ndr/ndr_krb5pac.c
rename to librpc/ndr/ndr_krb5pac.c

diff --git a/source3/Makefile.in b/source3/Makefile.in
index bad85f6c2e94ab023310c144dfe29ab688ae76a3..5bd642cdd36c2f84d515c0016740c02f784da141 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -376,7 +376,7 @@ LIBADS_OBJ = libads/ldap.o libads/ldap_printer.o \
             libads/ldap_schema.o libads/util.o libads/ndr.o
 
 LIBADS_SERVER_OBJ = libads/kerberos_verify.o libads/authdata.o \
-                   librpc/ndr/ndr_krb5pac.o \
+                   ../librpc/ndr/ndr_krb5pac.o \
                    librpc/gen_ndr/ndr_krb5pac.o
 
 SECRETS_OBJ = passdb/secrets.o passdb/machine_sid.o

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index f6f5d69d68ef10a36a163aab14ae59ef1e494661..f3e9d466562fae735152095f3928c8e24cef12ce 100644 (file)
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -318,7 +318,7 @@ NDR_KEYSVC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_keysvc.o
 [SUBSYSTEM::NDR_KRB5PAC]
 PUBLIC_DEPENDENCIES = LIBNDR NDR_NETLOGON NDR_SECURITY
 
-NDR_KRB5PAC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_krb5pac.o $(ndrsrcdir)/ndr_krb5pac.o
+NDR_KRB5PAC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_krb5pac.o ../librpc/ndr/ndr_krb5pac.o
 
 [SUBSYSTEM::NDR_XATTR]
 PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY

diff --git a/source4/librpc/ndr/ndr_krb5pac.c b/source4/librpc/ndr/ndr_krb5pac.c
deleted file mode 100644 (file)
index 1b32df4..0000000
--- a/source4/librpc/ndr/ndr_krb5pac.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   routines for marshalling/unmarshalling spoolss subcontext buffer structures
-
-   Copyright (C) Stefan Metzmacher 2005
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "includes.h"
-#include "librpc/gen_ndr/ndr_krb5pac.h"
-
-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, flags);
-       switch (level) {
-               case PAC_TYPE_LOGON_INFO:
-                       return NDR_ROUND(s,8);
-               default:
-                       return s;
-       }
-}
-
-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, flags);
-       return NDR_ROUND(s,8);
-}
-
-enum ndr_err_code ndr_push_PAC_BUFFER(struct ndr_push *ndr, int ndr_flags, const struct PAC_BUFFER *r)
-{
-       if (ndr_flags & NDR_SCALARS) {
-               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,0)));
-               {
-                       uint32_t _flags_save_PAC_INFO = ndr->flags;
-                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN8);
-                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->info));
-                       ndr->flags = _flags_save_PAC_INFO;
-               }
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               {
-                       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));
-                               {
-                                       struct ndr_push *_ndr_info;
-                                       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,0)));
-                               }
-                       }
-                       ndr->flags = _flags_save_PAC_INFO;
-               }
-       }
-       return NDR_ERR_SUCCESS;
-}
-
-enum ndr_err_code ndr_pull_PAC_BUFFER(struct ndr_pull *ndr, int ndr_flags, struct PAC_BUFFER *r)
-{
-       uint32_t _ptr_info;
-       TALLOC_CTX *_mem_save_info_0;
-       if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
-               NDR_CHECK(ndr_pull_PAC_TYPE(ndr, NDR_SCALARS, &r->type));
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->_ndr_size));
-               {
-                       uint32_t _flags_save_PAC_INFO = ndr->flags;
-                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN8);
-                       NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_info));
-                       if (_ptr_info) {
-                               NDR_PULL_ALLOC(ndr, r->info);
-                               NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->info, _ptr_info));
-                       } else {
-                               r->info = NULL;
-                       }
-                       ndr->flags = _flags_save_PAC_INFO;
-               }
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->_pad));
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               {
-                       uint32_t _flags_save_PAC_INFO = ndr->flags;
-                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN8);
-                       if (r->info) {
-                               uint32_t _relative_save_offset;
-                               _relative_save_offset = ndr->offset;
-                               NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->info));
-                               _mem_save_info_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                               NDR_PULL_SET_MEM_CTX(ndr, r->info, 0);
-                               {
-                                       struct ndr_pull *_ndr_info;
-                                       NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_info, 0, r->_ndr_size));
-                                       NDR_CHECK(ndr_pull_set_switch_value(_ndr_info, r->info, r->type));
-                                       NDR_CHECK(ndr_pull_PAC_INFO(_ndr_info, NDR_SCALARS|NDR_BUFFERS, r->info));
-                                       NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_info, 0, r->_ndr_size));
-                               }
-                               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0, 0);
-                               ndr->offset = _relative_save_offset;
-                       }
-                       ndr->flags = _flags_save_PAC_INFO;
-               }
-       }
-       return NDR_ERR_SUCCESS;
-}
-
-void ndr_print_PAC_BUFFER(struct ndr_print *ndr, const char *name, const struct PAC_BUFFER *r)
-{
-       ndr_print_struct(ndr, name, "PAC_BUFFER");
-       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,0):r->_ndr_size);
-       ndr_print_ptr(ndr, "info", r->info);
-       ndr->depth++;
-       if (r->info) {
-               ndr_print_set_switch_value(ndr, r->info, r->type);
-               ndr_print_PAC_INFO(ndr, "info", r->info);
-       }
-       ndr->depth--;
-       ndr_print_uint32(ndr, "_pad", r->_pad);
-       ndr->depth--;
-}