r3606: More DCOM fixes:

 - OXID tables work now. IOXIDResolver is used if there is used for getting a STRINGBINDING if none is known yet
 - Add custom dissectors for STRINGARRAY and DUALSTRINGARRAY. If there's a way to get rid of these later on (by supporting them thru pidl somehow), I'd be happy to use that instead of doing it manually.

I can now get to the point where we have created an object and are connected to
it. The only thing left to do is being able to set the Object UUID properly..
(This used to be commit 54e1e5edca50d3cd496c080715e84ec62cb2a10c)

5 files changed, 215 insertions, 20 deletions

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index b16c42b938..8a60406bd9 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -6,7 +6,8 @@ INIT_OBJ_FILES = \
 ADD_OBJ_FILES = \
 		librpc/ndr/ndr_basic.o \
 		librpc/ndr/ndr_sec.o \
-		librpc/ndr/ndr_spoolss_buf.o
+		librpc/ndr/ndr_spoolss_buf.o \
+		librpc/ndr/ndr_dcom.o 
 # End SUBSYSTEM LIBNDR_RAW
 ################################################
 
diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl
index 41e2ccb73c..912902a29a 100644
--- a/source4/librpc/idl/dcom.idl
+++ b/source4/librpc/idl/dcom.idl
@@ -162,21 +162,9 @@ interface ObjectRpcBaseTypes
 	typedef [public] struct 
 	{
 		uint16 wAuthnSvc; /* Cannot be zero. */
-		uint16 wAuthzSvc; /* Must not be zero. */
 		nstring PrincName; 
 	} 	SECURITYBINDING;
 
-
-	typedef [public] struct 
-	{
-		uint16 wNumEntries; /* Number of entries in array. */
-		uint16 wSecurityOffset; /* Offset of security info. */
-		/* The array contains two parts, a set of STRINGBINDINGs */
-		/* and a set of SECURITYBINDINGs. Each set is terminated by an */
-		/* extra zero. The shortest array contains four zeros. */
-		[size_is(wNumEntries)] uint16 aStringArray[];
-	} 	DUALSTRINGARRAY;
-
 	/* signature value for OBJREF (object reference, actually the */
 	/* marshaled form of a COM interface). */
 	const uint32 OBJREF_SIGNATURE = 0x574f454d; /* 'MEOW' */
@@ -218,14 +206,14 @@ interface ObjectRpcBaseTypes
 	typedef struct
 	{
 		STDOBJREF std; /* standard objref */
-		[flag(NDR_REMAINING)] DATA_BLOB saResAddr; /* resolver address */
+		STRINGARRAY saResAddr; /* resolver address */
 	} u_standard;
 
 	typedef struct
 	{
 		STDOBJREF std; /* standard objref */
 		GUID clsid; /* Clsid of handler code */
-		[flag(NDR_REMAINING)] DATA_BLOB saResAddr; /* resolver address */
+		STRINGARRAY saResAddr; /* resolver address */
 	} u_handler;
 
 	typedef struct
diff --git a/source4/librpc/ndr/ndr_dcom.c b/source4/librpc/ndr/ndr_dcom.c
new file mode 100644
index 0000000000..ee077dfd4f
--- /dev/null
+++ b/source4/librpc/ndr/ndr_dcom.c
@@ -0,0 +1,173 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   routines for marshalling/unmarshalling DCOM string arrays
+
+   Copyright (C) Jelmer Vernooij 2004
+   
+   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 2 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, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+
+#include "includes.h"
+
+NTSTATUS ndr_pull_DUALSTRINGARRAY(struct ndr_pull *ndr, int ndr_flags, struct DUALSTRINGARRAY *ar)
+{
+	uint16_t num_entries, security_offset;
+	uint16_t towerid;
+	uint32_t towernum = 0, conformant_size;
+
+	if (!(ndr_flags & NDR_SCALARS)) {
+		return NT_STATUS_OK;
+	}
+
+	NDR_CHECK(ndr_pull_uint32(ndr, &conformant_size));
+	NDR_CHECK(ndr_pull_uint16(ndr, &num_entries));
+	NDR_CHECK(ndr_pull_uint16(ndr, &security_offset));
+
+	ar->stringbindings = talloc_array_p(ndr, struct STRINGBINDING *, num_entries);
+	ar->stringbindings[0] = NULL;
+
+	do {
+		/* 'Peek' */
+		NDR_CHECK(ndr_pull_uint16(ndr, &towerid));
+
+		if (towerid > 0) {
+			ndr->offset -= 2; 
+			ar->stringbindings = talloc_realloc_p(ndr, ar->stringbindings, struct STRINGBINDING *, towernum+2);
+			ar->stringbindings[towernum] = talloc_p(ndr, struct STRINGBINDING);
+			NDR_CHECK(ndr_pull_STRINGBINDING(ndr, ndr_flags, ar->stringbindings[towernum]));
+			towernum++;
+		}
+	} while (towerid != 0);
+
+	ar->stringbindings[towernum] = NULL;
+	towernum = 0;
+
+	ar->securitybindings = talloc_array_p(ndr, struct SECURITYBINDING *, num_entries);
+	ar->securitybindings[0] = NULL;
+
+	do {
+		/* 'Peek' */
+		NDR_CHECK(ndr_pull_uint16(ndr, &towerid));
+
+		if (towerid > 0) {
+			ndr->offset -= 2; 
+			ar->securitybindings = talloc_realloc_p(ndr, ar->securitybindings, struct SECURITYBINDING *, towernum+2);
+			ar->securitybindings[towernum] = talloc_p(ndr, struct SECURITYBINDING);
+			NDR_CHECK(ndr_pull_SECURITYBINDING(ndr, ndr_flags, ar->securitybindings[towernum]));
+			towernum++;
+		}
+	} while (towerid != 0);
+	
+	ar->securitybindings[towernum] = NULL;
+	
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ndr_push_DUALSTRINGARRAY(struct ndr_push *ndr, int ndr_flags, struct DUALSTRINGARRAY *ar)
+{
+	return NT_STATUS_NOT_SUPPORTED;
+}
+
+/*
+  print a dom_sid
+*/
+void ndr_print_DUALSTRINGARRAY(struct ndr_print *ndr, const char *name, struct DUALSTRINGARRAY *ar)
+{
+	int i;
+	ndr->print(ndr, "%-25s: DUALSTRINGARRAY", name);
+	ndr->depth++;
+	ndr->print(ndr, "STRING BINDINGS");
+	ndr->depth++;
+	for (i=0;ar->stringbindings[i];i++)	{
+		char *idx = NULL;
+		asprintf(&idx, "[%d]", i);
+		if (idx) {
+			ndr_print_STRINGBINDING(ndr, idx, ar->stringbindings[i]);
+			free(idx);
+		}
+	}
+	ndr->depth--;
+	ndr->print(ndr, "SECURITY BINDINGS");
+	ndr->depth++;
+	for (i=0;ar->securitybindings[i];i++)	{
+		char *idx = NULL;
+		asprintf(&idx, "[%d]", i);
+		if (idx) {
+			ndr_print_SECURITYBINDING(ndr, idx, ar->securitybindings[i]);
+			free(idx);
+		}
+	}
+	ndr->depth--;
+}
+
+NTSTATUS ndr_pull_STRINGARRAY(struct ndr_pull *ndr, int ndr_flags, struct STRINGARRAY *ar)
+{
+	uint16_t towerid;
+	uint32_t towernum = 0;
+	uint16_t num_entries;
+
+	if (!(ndr_flags & NDR_SCALARS)) {
+		return NT_STATUS_OK;
+	}
+
+	NDR_CHECK(ndr_pull_uint16(ndr, &num_entries));
+
+	ar->stringbindings = talloc_array_p(ndr, struct STRINGBINDING *, 1);
+	ar->stringbindings[0] = NULL;
+
+	do {
+		/* 'Peek' */
+		NDR_CHECK(ndr_pull_uint16(ndr, &towerid));
+
+		if (towerid > 0) {
+			ndr->offset -= 2; 
+			ar->stringbindings = talloc_realloc_p(ndr, ar->stringbindings, struct STRINGBINDING *, towernum+2);
+			ar->stringbindings[towernum] = talloc_p(ndr, struct STRINGBINDING);
+			NDR_CHECK(ndr_pull_STRINGBINDING(ndr, ndr_flags, ar->stringbindings[towernum]));
+			towernum++;
+		}
+	} while (towerid != 0);
+
+	ar->stringbindings[towernum] = NULL;
+	towernum = 0;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ndr_push_STRINGARRAY(struct ndr_push *ndr, int ndr_flags, struct STRINGARRAY *ar)
+{
+	return NT_STATUS_NOT_SUPPORTED;
+}
+
+/*
+  print a dom_sid
+*/
+void ndr_print_STRINGARRAY(struct ndr_print *ndr, const char *name, struct STRINGARRAY *ar)
+{
+	int i;
+	ndr->print(ndr, "%-25s: STRINGARRAY", name);
+	ndr->depth++;
+	for (i=0;ar->stringbindings[i];i++)	{
+		char *idx = NULL;
+		asprintf(&idx, "[%d]", i);
+		if (idx) {
+			ndr_print_STRINGBINDING(ndr, idx, ar->stringbindings[i]);
+			free(idx);
+		}
+	}
+	ndr->depth--;
+}
diff --git a/source4/librpc/ndr/ndr_dcom.h b/source4/librpc/ndr/ndr_dcom.h
new file mode 100644
index 0000000000..06c2681621
--- /dev/null
+++ b/source4/librpc/ndr/ndr_dcom.h
@@ -0,0 +1,32 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   definitions for marshalling/unmarshalling DCOM string arrays
+
+   Copyright (C) Jelmer Vernooij 2004
+   
+   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 2 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, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+struct STRINGARRAY
+{
+	struct STRINGBINDING **stringbindings;
+};
+
+struct DUALSTRINGARRAY
+{
+	struct STRINGBINDING **stringbindings;
+	struct SECURITYBINDING **securitybindings;
+};
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index beccac78ca..dcbbe3ac7d 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -879,13 +879,14 @@ struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
 	pkt.ptype = DCERPC_PKT_REQUEST;
 	pkt.call_id = req->call_id;
 	pkt.auth_length = 0;
+	pkt.pfc_flags = 0;
 	pkt.u.request.alloc_hint = remaining;
 	pkt.u.request.context_id = 0;
 	pkt.u.request.opnum = opnum;
 	if (object) {
 		pkt.object.object = *object;
 		pkt.pfc_flags |= DCERPC_PFC_FLAG_ORPC;
-		/* FIXME: pfc_cflags is reset below! */
+		printf("OBJECT: %s\n", GUID_string(NULL, object));
 	}
 
 	DLIST_ADD(p->pending, req);
@@ -896,7 +897,7 @@ struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
 		BOOL last_frag = False;
 
 		first_packet = False;
-		pkt.pfc_flags = 0;
+		pkt.pfc_flags &= ~(DCERPC_PFC_FLAG_FIRST |DCERPC_PFC_FLAG_LAST);
 
 		if (remaining == stub_data->length) {
 			pkt.pfc_flags |= DCERPC_PFC_FLAG_FIRST;
@@ -974,7 +975,7 @@ NTSTATUS dcerpc_request_recv(struct rpc_request *req,
   perform a full request/response pair on a dcerpc pipe
 */
 NTSTATUS dcerpc_request(struct dcerpc_pipe *p, 
-			struct OBJREF *object,
+			struct GUID *object,
 			uint16_t opnum,
 			TALLOC_CTX *mem_ctx,
 			DATA_BLOB *stub_data_in,
@@ -1141,7 +1142,7 @@ static NTSTATUS dcerpc_ndr_validate_out(struct dcerpc_pipe *p,
   call dcerpc_ndr_request_recv() to receive the answer
 */
 struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
-						struct OBJREF *object,
+						struct GUID *object,
 					    uint32_t opnum,
 					    TALLOC_CTX *mem_ctx,
 					    NTSTATUS (*ndr_push)(struct ndr_push *, int, void *),
@@ -1278,7 +1279,7 @@ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
   standard format
 */
 NTSTATUS dcerpc_ndr_request(struct dcerpc_pipe *p,
-				struct OBJREF *object,
+				struct GUID *object,
 			    uint32_t opnum,
 			    TALLOC_CTX *mem_ctx,
 			    NTSTATUS (*ndr_push)(struct ndr_push *, int, void *),