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

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

7 files changed, 31 insertions, 10 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;
 	}
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 225f1321f5..711a0ae54e 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -132,7 +132,10 @@ BOOL torture_close_connection(struct cli_state *c)
 }
 
 /* open a rpc connection to a named pipe */
-NTSTATUS torture_rpc_connection(struct dcerpc_pipe **p, const char *pipe_name)
+NTSTATUS torture_rpc_connection(struct dcerpc_pipe **p, 
+				const char *pipe_name,
+				const char *pipe_uuid, 
+				uint32 pipe_version)
 {
         struct cli_state *cli;
         NTSTATUS status;
@@ -145,9 +148,9 @@ NTSTATUS torture_rpc_connection(struct dcerpc_pipe **p, const char *pipe_name)
                 return NT_STATUS_NO_MEMORY;
 	}
  
-	status = dcerpc_pipe_open_smb(*p, pipe_name);
+	status = dcerpc_pipe_open_smb(*p, pipe_name, pipe_uuid, pipe_version);
 	if (!NT_STATUS_IS_OK(status)) {
-                printf("Open of pipe %s failed with error (%s)\n",
+                printf("Open of pipe '%s' failed with error (%s)\n",
 		       pipe_name, nt_errstr(status));
                 return status;
         }
@@ -2817,7 +2820,7 @@ static BOOL run_rename(int dummy)
 static BOOL run_pipe_number(int dummy)
 {
 	struct cli_state *cli1;
-	const char *pipe_name = "\\SPOOLSS";
+	const char *pipe_name = "\\WKSSVC";
 	int fnum;
 	int num_pipes = 0;