summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-03-20 23:25:53 +0100
committerGünther Deschner <gd@samba.org>2009-03-24 11:14:06 +0100
commit8d901caf353ce99dfdde4e9e8ad5937f91df7c49 (patch)
tree358ec36218856ad23e42e55071cb0da2e028af19
parentc388efdbcb9ef1ecd5a81f7731ce56c7f79b2579 (diff)
downloadsamba-8d901caf353ce99dfdde4e9e8ad5937f91df7c49.tar.gz
samba-8d901caf353ce99dfdde4e9e8ad5937f91df7c49.tar.bz2
samba-8d901caf353ce99dfdde4e9e8ad5937f91df7c49.zip
move dcerpc.idl to main directory.
Guenther
-rw-r--r--librpc/idl/dcerpc.idl (renamed from source4/librpc/idl/dcerpc.idl)10
-rw-r--r--source4/librpc/config.mk4
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/librpc/idl/dcerpc.idl b/librpc/idl/dcerpc.idl
index 7c0abe6ab8..3ec416d5c6 100644
--- a/source4/librpc/idl/dcerpc.idl
+++ b/librpc/idl/dcerpc.idl
@@ -33,7 +33,7 @@ interface dcerpc
typedef struct {
} dcerpc_empty;
-
+
typedef [nodiscriminant] union {
[default] dcerpc_empty empty;
[case(LIBNDR_FLAG_OBJECT_PRESENT)] GUID object;
@@ -75,7 +75,7 @@ interface dcerpc
uint32 num_versions;
uint32 versions[num_versions];
} dcerpc_bind_nak_versions;
-
+
typedef [nodiscriminant] union {
[case(DECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED)] dcerpc_bind_nak_versions v;
[default] ;
@@ -145,7 +145,7 @@ interface dcerpc
const uint8 DCERPC_AUTH_LEVEL_DEFAULT = DCERPC_AUTH_LEVEL_CONNECT;
typedef [public] struct {
- dcerpc_AuthType auth_type;
+ dcerpc_AuthType auth_type;
dcerpc_AuthLevel auth_level;
uint8 auth_pad_length;
uint8 auth_reserved;
@@ -176,7 +176,7 @@ interface dcerpc
} dcerpc_cl_cancel;
typedef [public] struct {
- uint32 version;
+ uint32 version;
uint32 id;
boolean32 server_is_accepting;
} dcerpc_cancel_ack;
@@ -200,7 +200,7 @@ interface dcerpc
typedef [public] struct {
} dcerpc_shutdown;
-
+
typedef [public] struct {
} dcerpc_working;
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 2f1b14dc37..64a4750ab7 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -595,9 +595,9 @@ RPC_NDR_KEYSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_keysvc_c.o
[SUBSYSTEM::NDR_DCERPC]
PUBLIC_DEPENDENCIES = LIBNDR
-NDR_DCERPC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_dcerpc.o
+NDR_DCERPC_OBJ_FILES = ../librpc/gen_ndr/ndr_dcerpc.o
-PUBLIC_HEADERS += $(addprefix $(librpcsrcdir)/, gen_ndr/dcerpc.h gen_ndr/ndr_dcerpc.h)
+PUBLIC_HEADERS += ../librpc/gen_ndr/dcerpc.h ../librpc/gen_ndr/ndr_dcerpc.h
################################################
# Start SUBSYSTEM dcerpc