Rework the trustAuthInOutBlob with the help of a hand parser.

This produces a C structure that is sane, while still parsing the wire
blobs (as far as I can tell).

Andrew Bartlett
(This used to be commit b5dbe815e5dd3f865c7735bc76e02017a869f09b)

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index affd8e277d18e701e013b5caaa4aa6508d5a2a75..262a2cfa22a61bfb4252387a047cbcc2b19b02b8 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -73,6 +73,14 @@ LIBCLI_NETLOGON_OBJ_FILES = $(addprefix $(libclisrcdir)/, \
 
 $(eval $(call proto_header_template,$(libclisrcdir)/netlogon_proto.h,$(LIBCLI_NETLOGON_OBJ_FILES:.o=.c)))
 
+[SUBSYSTEM::LIBCLI_DRSBLOBS]
+PUBLIC_DEPENDENCIES = LIBNDR 
+
+LIBCLI_DRSBLOBS_OBJ_FILES = $(addprefix $(libclisrcdir)/, \
+       drsblobs.o)
+
+$(eval $(call proto_header_template,$(libclisrcdir)/drsblobs_proto.h,$(LIBCLI_DRSBLOBS_OBJ_FILES:.o=.c)))
+
 [PYTHON::python_netbios]
 LIBRARY_REALNAME = samba/netbios.$(SHLIBEXT)
 PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG

diff --git a/source4/libcli/drsblobs.c b/source4/libcli/drsblobs.c
new file mode 100644 (file)
index 0000000..126f2cc
--- /dev/null
+++ b/source4/libcli/drsblobs.c
@@ -0,0 +1,179 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Manually parsed structures found in the DRS protocol
+
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2008
+   
+   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 "libcli/drsblobs.h"
+
+/* parser auto-generated by pidl, then hand-modified by abartlet */
+
+/* Modified to have 'count' specified */
+static enum ndr_err_code ndr_push_AuthenticationInformationArray_with_count(struct ndr_push *ndr, int ndr_flags, int count, 
+                                                                const struct AuthenticationInformationArray *r)
+{
+       uint32_t cntr_array_0;
+       if (ndr_flags & NDR_SCALARS) {
+               NDR_CHECK(ndr_push_align(ndr, 4));
+               for (cntr_array_0 = 0; cntr_array_0 < count; cntr_array_0++) {
+                       NDR_CHECK(ndr_push_AuthenticationInformation(ndr, NDR_SCALARS, &r->array[cntr_array_0]));
+               }
+       }
+       if (ndr_flags & NDR_BUFFERS) {
+               for (cntr_array_0 = 0; cntr_array_0 < count; cntr_array_0++) {
+                       NDR_CHECK(ndr_push_AuthenticationInformation(ndr, NDR_BUFFERS, &r->array[cntr_array_0]));
+               }
+       }
+       return NDR_ERR_SUCCESS;
+}
+
+/* Modified to have 'count' specified, and to allocate the array */
+static enum ndr_err_code ndr_pull_AuthenticationInformationArray_with_count(struct ndr_pull *ndr, int ndr_flags, int count, struct AuthenticationInformationArray *r)
+{
+       uint32_t cntr_array_0;
+       TALLOC_CTX *_mem_save_array_0;
+       if (ndr_flags & NDR_SCALARS) {
+               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_PULL_ALLOC_N(ndr, r->array, count);
+               _mem_save_array_0 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, r->array, 0);
+               for (cntr_array_0 = 0; cntr_array_0 < count; cntr_array_0++) {
+                       NDR_CHECK(ndr_pull_AuthenticationInformation(ndr, NDR_SCALARS, &r->array[cntr_array_0]));
+               }
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_array_0, 0);
+       }
+       if (ndr_flags & NDR_BUFFERS) {
+               for (cntr_array_0 = 0; cntr_array_0 < count; cntr_array_0++) {
+                       NDR_CHECK(ndr_pull_AuthenticationInformation(ndr, NDR_BUFFERS, &r->array[cntr_array_0]));
+               }
+       }
+       return NDR_ERR_SUCCESS;
+}
+
+/* Modified to have 'count' specified */
+_PUBLIC_ void ndr_print_AuthenticationInformationArray_with_count(struct ndr_print *ndr, const char *name, int count, const struct AuthenticationInformationArray *r)
+{
+       uint32_t cntr_array_0;
+       ndr_print_struct(ndr, name, "AuthenticationInformationArray");
+       ndr->depth++;
+       ndr->print(ndr, "%s: ARRAY(%d)", "array", (int)1);
+       ndr->depth++;
+       for (cntr_array_0=0;cntr_array_0<count;cntr_array_0++) {
+               char *idx_0=NULL;
+               if (asprintf(&idx_0, "[%d]", cntr_array_0) != -1) {
+                       ndr_print_AuthenticationInformation(ndr, "array", &r->array[cntr_array_0]);
+                       free(idx_0);
+               }
+       }
+       ndr->depth--;
+       ndr->depth--;
+}
+
+/* Modified to call AuthenticationInformationArray with 'count' specified */
+_PUBLIC_ enum ndr_err_code ndr_push_trustAuthInOutBlob(struct ndr_push *ndr, int ndr_flags, const struct trustAuthInOutBlob *r)
+{
+       if (ndr_flags & NDR_SCALARS) {
+               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
+               NDR_CHECK(ndr_push_relative_ptr1(ndr, r->current));
+               NDR_CHECK(ndr_push_relative_ptr1(ndr, r->previous));
+       }
+       if (ndr_flags & NDR_BUFFERS) {
+               if (r->current) {
+                       NDR_CHECK(ndr_push_relative_ptr2(ndr, r->current));
+                       NDR_CHECK(ndr_push_AuthenticationInformationArray_with_count(ndr, NDR_SCALARS|NDR_BUFFERS, r->count, r->current));
+               }
+               if (r->previous) {
+                       NDR_CHECK(ndr_push_relative_ptr2(ndr, r->previous));
+                       NDR_CHECK(ndr_push_AuthenticationInformationArray_with_count(ndr, NDR_SCALARS|NDR_BUFFERS, r->count, r->previous));
+               }
+       }
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_trustAuthInOutBlob(struct ndr_pull *ndr, int ndr_flags, struct trustAuthInOutBlob *r)
+{
+       uint32_t _ptr_current;
+       TALLOC_CTX *_mem_save_current_0;
+       uint32_t _ptr_previous;
+       TALLOC_CTX *_mem_save_previous_0;
+       if (ndr_flags & NDR_SCALARS) {
+               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_current));
+               if (_ptr_current) {
+                       NDR_PULL_ALLOC(ndr, r->current);
+                       NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->current, _ptr_current));
+               } else {
+                       r->current = NULL;
+               }
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_previous));
+               if (_ptr_previous) {
+                       NDR_PULL_ALLOC(ndr, r->previous);
+                       NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->previous, _ptr_previous));
+               } else {
+                       r->previous = NULL;
+               }
+       }
+       if (ndr_flags & NDR_BUFFERS) {
+               if (r->current) {
+                       uint32_t _relative_save_offset;
+                       _relative_save_offset = ndr->offset;
+                       NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->current));
+                       _mem_save_current_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, r->current, 0);
+                       NDR_CHECK(ndr_pull_AuthenticationInformationArray_with_count(ndr, NDR_SCALARS|NDR_BUFFERS, r->count, r->current));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_current_0, 0);
+                       ndr->offset = _relative_save_offset;
+               }
+               if (r->previous) {
+                       uint32_t _relative_save_offset;
+                       _relative_save_offset = ndr->offset;
+                       NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->previous));
+                       _mem_save_previous_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, r->previous, 0);
+                       NDR_CHECK(ndr_pull_AuthenticationInformationArray_with_count(ndr, NDR_SCALARS|NDR_BUFFERS, r->count, r->previous));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_previous_0, 0);
+                       ndr->offset = _relative_save_offset;
+               }
+       }
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_trustAuthInOutBlob(struct ndr_print *ndr, const char *name, const struct trustAuthInOutBlob *r)
+{
+       ndr_print_struct(ndr, name, "trustAuthInOutBlob");
+       ndr->depth++;
+       ndr_print_uint32(ndr, "count", r->count);
+       ndr_print_ptr(ndr, "current", r->current);
+       ndr->depth++;
+       if (r->current) {
+               ndr_print_AuthenticationInformationArray_with_count(ndr, "current", r->count, r->current);
+       }
+       ndr->depth--;
+       ndr_print_ptr(ndr, "previous", r->previous);
+       ndr->depth++;
+       if (r->previous) {
+               ndr_print_AuthenticationInformationArray_with_count(ndr, "previous", r->count, r->previous);
+       }
+       ndr->depth--;
+       ndr->depth--;
+}
+
+

diff --git a/source4/libcli/drsblobs.h b/source4/libcli/drsblobs.h
new file mode 100644 (file)
index 0000000..8fee411
--- /dev/null
+++ b/source4/libcli/drsblobs.h
@@ -0,0 +1,28 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Manually parsed structures found in the DRS protocol
+
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2008
+   
+   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/>.
+*/
+
+#ifndef __LIBCLI_DRSBLOBS_H__
+#define __LIBCLI_DRSBLOBS_H__
+
+#include "librpc/gen_ndr/ndr_drsblobs.h"
+
+#include "libcli/drsblobs_proto.h"
+#endif /* __CLDAP_SERVER_PROTO_H__ */

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index d87683dd6f7b0fa6c433c0c8a5aac18a379feda6..d884c0d3cb617b5f9545da1bad4cc50f0a9a65d2 100644 (file)
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -133,7 +133,7 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_COMPRESSION NDR_SECURITY NDR_SAMR ASN1_UTIL
 NDR_DRSUAPI_OBJ_FILES = $(gen_ndrsrcdir)/ndr_drsuapi.o $(ndrsrcdir)/ndr_drsuapi.o
 
 [SUBSYSTEM::NDR_DRSBLOBS]
-PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI
+PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI LIBCLI_DRSBLOBS
 
 NDR_DRSBLOBS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_drsblobs.o
 

diff --git a/source4/librpc/idl/drsblobs.idl b/source4/librpc/idl/drsblobs.idl
index b0cddfcdf9c877df941d3f9072f7131c4c1c77fc..eb85989edafad49a88fcb95ad3d247cde4fe78be 100644 (file)
--- a/source4/librpc/idl/drsblobs.idl
+++ b/source4/librpc/idl/drsblobs.idl
@@ -401,7 +401,7 @@ interface drsblobs {
                [case(TRUST_AUTH_TYPE_VERSION)] AuthInfoVersion version;
        } AuthInfo;
 
-       typedef struct {
+       typedef [public] struct {
                NTTIME LastUpdateTime;
                trustAuthType AuthType;
                
@@ -422,32 +422,15 @@ interface drsblobs {
                [flag(NDR_ALIGN4)] DATA_BLOB _pad;
        } AuthenticationInformation;
 
-       typedef struct {
-               AuthenticationInformation info[1];
-       } AuthenticationInformation1;
-
-       typedef struct {
-               AuthenticationInformation info[2];
-       } AuthenticationInformation2;
-
-       typedef struct {
-               [relative] AuthenticationInformation1 *current;
-               [relative] AuthenticationInformation1 *previous;
-       } AuthenticationInformationCtr1;
-
-       typedef struct {
-               [relative] AuthenticationInformation2 *current;
-               [relative] AuthenticationInformation2 *previous;
-       } AuthenticationInformationCtr2;
+       typedef [nopull,nopush,noprint] struct {
+               /* sizeis here is bogus, but this is here just for the structure */
+               [size_is(1)] AuthenticationInformation array[];
+       } AuthenticationInformationArray;
 
-       typedef [nodiscriminant] union {
-               [case(1)] AuthenticationInformationCtr1 info1;
-               [case(2)] AuthenticationInformationCtr2 info2;
-       } AuthenticationInformationCtr;
-
-       typedef [public] struct {
+       typedef [public,nopull,nopush,noprint] struct {
                uint32 count;
-               [switch_is(count)] AuthenticationInformationCtr auth;
+               [relative] AuthenticationInformationArray *current;
+               [relative] AuthenticationInformationArray *previous;
        } trustAuthInOutBlob;
 
        void decode_trustAuthInOut(