5 files changed, 26 insertions, 29 deletions
diff --git a/source4/librpc/idl/epmapper.idl b/source4/librpc/idl/epmapper.idl
index af0bd2483d..223883c366 100644
--- a/source4/librpc/idl/epmapper.idl
+++ b/source4/librpc/idl/epmapper.idl
@@ -33,12 +33,6 @@ interface epmapper
 	const int EPMAPPER_STATUS_OK = 0;
 
 
-	/* this guid indicates NDR encoding in a protocol tower */
-	const string NDR_GUID = "8a885d04-1ceb-11c9-9fe8-08002b104860";
-	const string NDR_GUID_VERSION = 2;
-
-	const string NDR64_GUID = "71710533-beba-4937-8319-b5dbef9ccc36";
-	const string NDR64_GUID_VERSION = 1;
 
 	typedef [enum8bit] enum {
 		
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index ca66078614..3d8bdf9f36 100644
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -278,3 +278,5 @@ typedef NTSTATUS (*ndr_pull_flags_fn_t)(struct ndr_pull *, int ndr_flags, void *
 typedef void (*ndr_print_fn_t)(struct ndr_print *, const char *, const void *);
 typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, const void *);
 
+extern const struct dcerpc_syntax_id ndr_transfer_syntax;
+extern const struct dcerpc_syntax_id ndr64_transfer_syntax;
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c
index 2e6fd5b432..260d445870 100644
--- a/source4/librpc/ndr/ndr.c
+++ b/source4/librpc/ndr/ndr.c
@@ -32,6 +32,17 @@
 
 #define NDR_BASE_MARSHALL_SIZE 1024
 
+/* this guid indicates NDR encoding in a protocol tower */
+const struct dcerpc_syntax_id ndr_transfer_syntax = {
+  { 0x8a885d04, 0x1ceb, 0x11c9, {0x9f, 0xe8}, {0x08,0x00,0x2b,0x10,0x48,0x60} },
+  2
+};
+
+const struct dcerpc_syntax_id ndr64_transfer_syntax = {
+  { 0x71710533, 0xbeba, 0x4937, {0x83, 0x19}, {0xb5,0xdb,0xef,0x9c,0xcc,0x36} },
+  1
+};
+
 /*
   work out the number of bytes needed to align on a n byte boundary
 */
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 10093cfcbb..14305c3449 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -794,15 +794,10 @@ NTSTATUS dcerpc_init_syntaxes(const struct dcerpc_interface_table *table,
 			      struct dcerpc_syntax_id *syntax,
 			      struct dcerpc_syntax_id *transfer_syntax)
 {
-	NTSTATUS status;
-
 	syntax->uuid = table->uuid;
 	syntax->if_version = table->if_version;
 
-	status = GUID_from_string(NDR_GUID, &transfer_syntax->uuid);
-	if (!NT_STATUS_IS_OK(status)) return status;
-
-	transfer_syntax->if_version = NDR_GUID_VERSION;
+	*transfer_syntax = ndr_transfer_syntax;
 
 	return NT_STATUS_OK;
 }
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 3a1e3c6cff..4e7550c701 100644
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -221,12 +221,16 @@ const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor)
 				/* lhs is used: UUID */
 				char *uuidstr;
 
-				uuidstr = GUID_string(mem_ctx, &uuid);
-
-				if (strcasecmp(uuidstr, NDR_GUID) == 0) {
+				if (GUID_equal(&uuid, &ndr_transfer_syntax.uuid)) {
 					return "NDR";
 				} 
 
+				if (GUID_equal(&uuid, &ndr64_transfer_syntax.uuid)) {
+					return "NDR64";
+				} 
+
+				uuidstr = GUID_string(mem_ctx, &uuid);
+
 				return talloc_asprintf(mem_ctx, " uuid %s/0x%02x", uuidstr, if_version);
 			} else { /* IPX */
 				return talloc_asprintf(mem_ctx, "IPX:%s", 
@@ -497,7 +501,7 @@ NTSTATUS dcerpc_floor_get_lhs_data(struct epm_floor *epm_floor, struct GUID *uui
 	return status;
 }
 
-static DATA_BLOB dcerpc_floor_pack_lhs_data(TALLOC_CTX *mem_ctx, struct GUID *uuid, uint32_t if_version)
+static DATA_BLOB dcerpc_floor_pack_lhs_data(TALLOC_CTX *mem_ctx, const struct GUID *uuid, uint32_t if_version)
 {
 	struct ndr_push *ndr = ndr_push_init_ctx(mem_ctx);
 
@@ -743,7 +747,6 @@ NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx, struct dcerpc_binding *
 {
 	const enum epm_protocol *protseq = NULL;
 	int num_protocols = -1, i;
-	struct GUID ndr_guid;
 	NTSTATUS status;
 	
 	/* Find transport */
@@ -773,12 +776,9 @@ NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx, struct dcerpc_binding *
 	/* Floor 1 */
 	tower->floors[1].lhs.protocol = EPM_PROTOCOL_UUID;
 
-	status = GUID_from_string(NDR_GUID, &ndr_guid);
-	if (NT_STATUS_IS_ERR(status)) {
-		return status;
-	}
-
-	tower->floors[1].lhs.lhs_data = dcerpc_floor_pack_lhs_data(mem_ctx, &ndr_guid, NDR_GUID_VERSION);
+	tower->floors[1].lhs.lhs_data = dcerpc_floor_pack_lhs_data(mem_ctx, 
+								&ndr_transfer_syntax.uuid, 
+								ndr_transfer_syntax.if_version);
 	
 	tower->floors[1].rhs.uuid.unknown = data_blob_talloc_zero(mem_ctx, 2);
 	
@@ -1340,12 +1340,7 @@ NTSTATUS dcerpc_secondary_context(struct dcerpc_pipe *p,
 	p2->syntax.uuid = table->uuid;
 	p2->syntax.if_version = table->if_version;
 
-	status = GUID_from_string(NDR_GUID, &p2->transfer_syntax.uuid);
-	if (!NT_STATUS_IS_OK(status)) {
-		talloc_free(p2);
-		return status;
-	}
-	p2->transfer_syntax.if_version = NDR_GUID_VERSION;
+	p2->transfer_syntax = ndr_transfer_syntax;
 
 	status = dcerpc_alter_context(p2, p2, &p2->syntax, &p2->transfer_syntax);
 	if (!NT_STATUS_IS_OK(status)) {