use the auto-generated UUID, version and name rather than listing them

in the dcerpc core code
(This used to be commit 16ffeb7c80bfe7f1bfbfce8c98066e9ddbca7686)

6 files changed, 24 insertions, 6 deletions

diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c
index 7d851675e0..abd78a8cd0 100644
--- a/source4/torture/rpc/dfs.c
+++ b/source4/torture/rpc/dfs.c
@@ -172,7 +172,10 @@ BOOL torture_rpc_dfs(int dummy)
 
 	mem_ctx = talloc_init("torture_rpc_dfs");
 
-	status = torture_rpc_connection(&p, "netdfs");
+	status = torture_rpc_connection(&p, 
+					DCERPC_NETDFS_NAME,
+					DCERPC_NETDFS_UUID,
+					DCERPC_NETDFS_VERSION);
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
 	}
diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c
index 3e674a21b8..fe044fbc6c 100644
--- a/source4/torture/rpc/echo.c
+++ b/source4/torture/rpc/echo.c
@@ -193,7 +193,10 @@ BOOL torture_rpc_echo(int dummy)
 
 	mem_ctx = talloc_init("torture_rpc_echo");
 
-	status = torture_rpc_connection(&p, "rpcecho");
+	status = torture_rpc_connection(&p, 
+					DCERPC_RPCECHO_NAME,
+					DCERPC_RPCECHO_UUID,
+					DCERPC_RPCECHO_VERSION);
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
 	}
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index e810ffa585..1e6f8be990 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -511,7 +511,10 @@ BOOL torture_rpc_lsa(int dummy)
 
 	mem_ctx = talloc_init("torture_rpc_lsa");
 
-	status = torture_rpc_connection(&p, "lsarpc");
+	status = torture_rpc_connection(&p, 
+					DCERPC_LSARPC_NAME, 
+					DCERPC_LSARPC_UUID, 
+					DCERPC_LSARPC_VERSION);
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
 	}
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index fb00cc56df..fddf97ef74 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -497,7 +497,10 @@ BOOL torture_rpc_samr(int dummy)
 
 	mem_ctx = talloc_init("torture_rpc_samr");
 
-	status = torture_rpc_connection(&p, "samr");
+	status = torture_rpc_connection(&p, 
+					DCERPC_SAMR_NAME,
+					DCERPC_SAMR_UUID,
+					DCERPC_SAMR_VERSION);
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
 	}
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index feaeae7b79..53e25a3e14 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -261,7 +261,10 @@ BOOL torture_rpc_spoolss(int dummy)
 
 	mem_ctx = talloc_init("torture_rpc_spoolss");
 
-	status = torture_rpc_connection(&p, "spoolss");
+	status = torture_rpc_connection(&p, 
+					DCERPC_SPOOLSS_NAME,
+					DCERPC_SPOOLSS_UUID,
+					DCERPC_SPOOLSS_VERSION);
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
 	}
diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index 9d4b38d40f..5f8a63de10 100644
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -90,7 +90,10 @@ BOOL torture_rpc_wkssvc(int dummy)
 
 	mem_ctx = talloc_init("torture_rpc_wkssvc");
 
-	status = torture_rpc_connection(&p, "wkssvc");
+	status = torture_rpc_connection(&p, 
+					DCERPC_WKSSVC_NAME,
+					DCERPC_WKSSVC_UUID,
+					DCERPC_WKSSVC_VERSION);
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
 	}