summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/include/includes.h1
-rw-r--r--source4/lib/com/dcom/dcom.h1
-rw-r--r--source4/librpc/config.mk2
-rw-r--r--source4/librpc/idl/orpc.idl14
-rw-r--r--source4/librpc/ndr/ndr_orpc.h40
5 files changed, 15 insertions, 43 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 43e07ad482..f7504dcf5d 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -116,7 +116,6 @@ enum brl_type {
#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"
diff --git a/source4/lib/com/dcom/dcom.h b/source4/lib/com/dcom/dcom.h
index 308852848d..438bf8b9f7 100644
--- a/source4/lib/com/dcom/dcom.h
+++ b/source4/lib/com/dcom/dcom.h
@@ -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 {
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 6d63b1bde8..afcb59bbf5 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -322,7 +322,7 @@ NOPROTO = YES
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]
diff --git a/source4/librpc/idl/orpc.idl b/source4/librpc/idl/orpc.idl
index 24879bbe17..71a4fd65d2 100644
--- a/source4/librpc/idl/orpc.idl
+++ b/source4/librpc/idl/orpc.idl
@@ -6,7 +6,8 @@
*/
[
- pointer_default(unique)
+ pointer_default(unique),
+ helper("librpc/ndr/ndr_orpc.h")
]
interface ObjectRpcBaseTypes
{
@@ -38,6 +39,7 @@ interface ObjectRpcBaseTypes
/* Component Object Model version number */
+
typedef [public] struct
{
uint16 MajorVersion; /* Major version number */
@@ -103,6 +105,16 @@ interface ObjectRpcBaseTypes
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
diff --git a/source4/librpc/ndr/ndr_orpc.h b/source4/librpc/ndr/ndr_orpc.h
deleted file mode 100644
index 171a783b8e..0000000000
--- a/source4/librpc/ndr/ndr_orpc.h
+++ /dev/null
@@ -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__ */