svn commit: samba r5676 - in branches/SAMBA_4_0/source: lib/com/dcom librpc/idl torture/com

[jelmer at samba.org]

Author: jelmer
Date: 2005-03-07 02:14:38 +0000 (Mon, 07 Mar 2005)
New Revision: 5676

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5676

Log:
Fix some alignment issues and IRemoteActivation

Modified:
   branches/SAMBA_4_0/source/lib/com/dcom/main.c
   branches/SAMBA_4_0/source/librpc/idl/orpc.idl
   branches/SAMBA_4_0/source/librpc/idl/remact.idl
   branches/SAMBA_4_0/source/torture/com/simple.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/com/dcom/main.c
===================================================================
--- branches/SAMBA_4_0/source/lib/com/dcom/main.c	2005-03-06 22:37:31 UTC (rev 5675)
+++ branches/SAMBA_4_0/source/lib/com/dcom/main.c	2005-03-07 02:14:38 UTC (rev 5676)
@@ -30,6 +30,16 @@
 
 #define DCOM_NEGOTIATED_PROTOCOLS { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB, EPM_PROTOCOL_NCALRPC }
 
+struct dcom_client_context *dcom_client_init(struct com_context *ctx, const char *domain, const char *user, const char *password)
+{
+	ctx->dcom = talloc(ctx, struct dcom_client_context);
+	ctx->dcom->domain = domain;
+	ctx->dcom->user = user;
+	ctx->dcom->password = password;
+
+	return ctx->dcom;
+}
+
 static NTSTATUS dcerpc_binding_from_STRINGBINDING(TALLOC_CTX *mem_ctx, struct dcerpc_binding *b, struct STRINGBINDING *bd)
 {
 	char *host, *endpoint;

Modified: branches/SAMBA_4_0/source/librpc/idl/orpc.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/orpc.idl	2005-03-06 22:37:31 UTC (rev 5675)
+++ branches/SAMBA_4_0/source/librpc/idl/orpc.idl	2005-03-07 02:14:38 UTC (rev 5676)
@@ -99,7 +99,7 @@
 
 	/* DUALSTRINGARRAYS are the return type for arrays of network addresses, */
 	/* arrays of endpoints and arrays of both used in many ORPC interfaces */
-	typedef [public] struct 
+	typedef [public,flag(NDR_NOALIGN)] struct 
 	{
 		uint16 wTowerId; /* Cannot be zero. */
 		nstring NetworkAddr; 
@@ -107,9 +107,10 @@
 
 
 	const uint16 COM_C_AUTHZ_NONE = 0xffff;
-	typedef [public] struct 
+	typedef [public,flag(NDR_NOALIGN)] struct 
 	{
 		uint16 wAuthnSvc; /* Cannot be zero. */
+		uint16 wAuthzSvc;
 		nstring PrincName; 
 	} 	SECURITYBINDING;
 

Modified: branches/SAMBA_4_0/source/librpc/idl/remact.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/remact.idl	2005-03-06 22:37:31 UTC (rev 5675)
+++ branches/SAMBA_4_0/source/librpc/idl/remact.idl	2005-03-07 02:14:38 UTC (rev 5676)
@@ -21,7 +21,11 @@
 		RPC_C_IMP_LEVEL_IMPERSONATE = 3,
 		RPC_C_IMP_LEVEL_DELEGATE = 4
 	} imp_levels;
-	
+
+	typedef struct {
+		MInterfacePointer *ip;
+	} pMInterfacePointer;
+
 	const uint32 MODE_GET_CLASS_OBJECT = 0xffffffff;
 	WERROR RemoteActivation (
 			[in] ORPCTHIS this,
@@ -41,7 +45,7 @@
 			[out] uint32 AuthnHint,
 			[out] COMVERSION ServerVersion,
 			[out] WERROR hr,
-			[out,size_is(Interfaces)] MInterfacePointer *ifaces[],
+			[out,size_is(Interfaces)] pMInterfacePointer ifaces[],
 			[out,size_is(Interfaces)] WERROR results[]
 			);
 }

Modified: branches/SAMBA_4_0/source/torture/com/simple.c
===================================================================
--- branches/SAMBA_4_0/source/torture/com/simple.c	2005-03-06 22:37:31 UTC (rev 5675)
+++ branches/SAMBA_4_0/source/torture/com/simple.c	2005-03-07 02:14:38 UTC (rev 5676)
@@ -39,6 +39,7 @@
 	int i;
 
 	com_init(&ctx);
+	dcom_client_init(ctx, lp_parm_string(-1, "torture", "userdomain"), lp_parm_string(-1, "torture", "username"), lp_parm_string(-1, "torture", "password"));
 
 	GUID_from_string(COM_ISTREAM_UUID, &IID[0]);
 	GUID_from_string(COM_IUNKNOWN_UUID, &IID[1]);