svn commit: samba r14384 - in branches/SAMBA_4_0/source: include lib/com/dcom librpc librpc/idl librpc/ndr

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-14 16:21:34 +0000 (Tue, 14 Mar 2006)
New Revision: 14384

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

Log:
Remove orpc code from includes.h

Removed:
   branches/SAMBA_4_0/source/librpc/ndr/ndr_orpc.h
Modified:
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/lib/com/dcom/dcom.h
   branches/SAMBA_4_0/source/librpc/config.mk
   branches/SAMBA_4_0/source/librpc/idl/orpc.idl
   branches/SAMBA_4_0/source/librpc/ndr/


Changeset:
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h	2006-03-14 15:44:40 UTC (rev 14383)
+++ branches/SAMBA_4_0/source/include/includes.h	2006-03-14 16:21:34 UTC (rev 14384)
@@ -116,7 +116,6 @@
 #include "libcli/util/nterr.h"
 #include "libcli/util/doserr.h"
 #include "librpc/ndr/libndr.h"
-#include "librpc/ndr/ndr_orpc.h"
 #include "librpc/rpc/dcerpc.h"
 #include "libcli/nbt/libnbt.h"
 #include "libcli/util/proto.h"

Modified: branches/SAMBA_4_0/source/lib/com/dcom/dcom.h
===================================================================
--- branches/SAMBA_4_0/source/lib/com/dcom/dcom.h	2006-03-14 15:44:40 UTC (rev 14383)
+++ branches/SAMBA_4_0/source/lib/com/dcom/dcom.h	2006-03-14 16:21:34 UTC (rev 14384)
@@ -22,6 +22,7 @@
 #define _DCOM_H 
 
 #include "lib/com/com.h"
+#include "librpc/gen_ndr/orpc.h"
 #include "lib/com/dcom/proto.h"
 
 struct dcom_client_context {

Modified: branches/SAMBA_4_0/source/librpc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/librpc/config.mk	2006-03-14 15:44:40 UTC (rev 14383)
+++ branches/SAMBA_4_0/source/librpc/config.mk	2006-03-14 16:21:34 UTC (rev 14384)
@@ -322,7 +322,7 @@
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 
 [SUBSYSTEM::NDR_ORPC_MANUAL]
-PRIVATE_PROTO_HEADER = ndr/ndr_orpc_proto.h
+PRIVATE_PROTO_HEADER = ndr/ndr_orpc.h
 OBJ_FILES = ndr/ndr_orpc.o 
 
 [LIBRARY::NDR_ORPC]

Modified: branches/SAMBA_4_0/source/librpc/idl/orpc.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/orpc.idl	2006-03-14 15:44:40 UTC (rev 14383)
+++ branches/SAMBA_4_0/source/librpc/idl/orpc.idl	2006-03-14 16:21:34 UTC (rev 14384)
@@ -6,7 +6,8 @@
  */
 
 [
-	pointer_default(unique)
+	pointer_default(unique),
+	helper("librpc/ndr/ndr_orpc.h")
 ]
 interface ObjectRpcBaseTypes
 {
@@ -38,6 +39,7 @@
 
 	/* Component Object Model version number */
 
+
 	typedef [public] struct 
 	{
 		uint16 MajorVersion; /* Major version number */
@@ -103,7 +105,17 @@
 		nstring NetworkAddr; 
 	} 	STRINGBINDING;
 
+	typedef [public,nopush,nopull,noprint] struct 
+	{
+		STRINGBINDING **stringbindings;
+	} STRINGARRAY;
 
+	typedef [public,nopush,nopull,noprint] struct 
+	{
+		STRINGBINDING **stringbindings;
+		SECURITYBINDING **securitybindings;
+	} DUALSTRINGARRAY;
+
 	const uint16 COM_C_AUTHZ_NONE = 0xffff;
 	typedef [public,flag(NDR_NOALIGN)] struct 
 	{


Property changes on: branches/SAMBA_4_0/source/librpc/ndr
___________________________________________________________________
Name: svn:ignore
   - libndr_proto.h
*.po
*.d
ndr_orpc_proto.h
ndr_krb5pac.h
ndr_spoolss_buf.h
ndr_compression.h
ndr_drsuapi.h
ndr_sec.h

   + libndr_proto.h
*.po
*.d
ndr_orpc.h
ndr_krb5pac.h
ndr_spoolss_buf.h
ndr_compression.h
ndr_drsuapi.h
ndr_sec.h


Deleted: branches/SAMBA_4_0/source/librpc/ndr/ndr_orpc.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_orpc.h	2006-03-14 15:44:40 UTC (rev 14383)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_orpc.h	2006-03-14 16:21:34 UTC (rev 14384)
@@ -1,40 +0,0 @@
-/* 
-   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.
-*/
-
-#ifndef __NDR_ORPC_H__
-#define __NDR_ORPC_H__
-
-struct STRINGARRAY
-{
-	struct STRINGBINDING **stringbindings;
-};
-
-struct DUALSTRINGARRAY
-{
-	struct STRINGBINDING **stringbindings;
-	struct SECURITYBINDING **securitybindings;
-};
-
-#include "librpc/gen_ndr/orpc.h"
-#include "librpc/ndr/ndr_orpc_proto.h"
-
-#endif /* __NDR_ORPC_H__ */