3 files changed, 54 insertions, 4 deletions
diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c
new file mode 100644
index 0000000000..eee192e37a
--- /dev/null
+++ b/source4/torture/rpc/echo.c
@@ -0,0 +1,51 @@
+/* 
+   Unix SMB/CIFS implementation.
+   test suite for echo rpc operations
+
+   Copyright (C) Andrew Tridgell 2003
+   
+   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.
+*/
+
+#include "includes.h"
+
+BOOL torture_rpc_echo(int dummy)
+{
+        NTSTATUS status;
+        struct dcerpc_pipe *p;
+	TALLOC_CTX *mem_ctx;
+	int i;
+
+	mem_ctx = talloc_init("torture_rpc_echo");
+
+	status = torture_rpc_connection(&p, "rpcecho");
+	if (!NT_STATUS_IS_OK(status)) {
+		return False;
+	}
+	
+	for (i=0;i<10;i++) {
+		int n;
+		status = dcerpc_rpcecho_addone(p, i, &n);
+		if (!NT_STATUS_IS_OK(status)) {
+			printf("AddOne(%d) failed - %s\n", i, nt_errstr(status));
+			goto done;
+		}
+		printf("%d + 1 = %d\n", i, n);
+	}
+
+done:
+        torture_rpc_close(p);
+	return NT_STATUS_IS_OK(status);
+}
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index c618685676..cac7f80d5a 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -21,9 +21,8 @@
 
 #include "includes.h"
 
-/* Helper function for RPC-OPEN test */
-static DATA_BLOB blob_lsa_open_policy_req(TALLOC_CTX *mem_ctx, BOOL sec_qos, 
-					  uint32 des_access)
+/* form a lsa open request */
+static DATA_BLOB blob_lsa_open_policy_req(TALLOC_CTX *mem_ctx, BOOL sec_qos, uint32 des_access)
 {
 	prs_struct qbuf;
 	LSA_Q_OPEN_POL q;
@@ -32,7 +31,6 @@ static DATA_BLOB blob_lsa_open_policy_req(TALLOC_CTX *mem_ctx, BOOL sec_qos,
 	ZERO_STRUCT(q);
 
 	/* Initialise parse structures */
-
 	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
 
 	/* Initialise input parameters */
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index c3f7514e9b..8dc82242a2 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -4026,6 +4026,7 @@ static struct {
 	{"SCAN-ALIASES", torture_trans2_aliases, 0},
 	{"SCAN-SMB", torture_smb_scan, 0},
         {"RPC-LSA", torture_rpc_lsa, 0},
+        {"RPC-ECHO", torture_rpc_echo, 0},
 	{NULL, NULL, 0}};