5 files changed, 4 insertions, 61 deletions
diff --git a/source4/torture/libnet/groupinfo.c b/source4/torture/libnet/groupinfo.c
index 01f2f9e692..772427c323 100644
--- a/source4/torture/libnet/groupinfo.c
+++ b/source4/torture/libnet/groupinfo.c
@@ -24,7 +24,7 @@
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "param/param.h"
-#include "torture/libnet/utils.h"
+#include "torture/libnet/proto.h"
 
 #define TEST_GROUPNAME  "libnetgroupinfotest"
 
diff --git a/source4/torture/libnet/groupman.c b/source4/torture/libnet/groupman.c
index f44793ac82..02a94a81d7 100644
--- a/source4/torture/libnet/groupman.c
+++ b/source4/torture/libnet/groupman.c
@@ -24,7 +24,7 @@
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "param/param.h"
-#include "torture/libnet/utils.h"
+#include "torture/libnet/proto.h"
 
 
 static bool test_groupadd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index 04a9240eef..686f1f13f3 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -24,7 +24,7 @@
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "param/param.h"
-#include "torture/libnet/utils.h"
+#include "torture/libnet/proto.h"
 
 
 #define TEST_USERNAME  "libnetuserinfotest"
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 98365d3bff..0faca57e8c 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -25,7 +25,7 @@
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "param/param.h"
 
-#include "torture/libnet/utils.h"
+#include "torture/libnet/proto.h"
 
 
 static bool test_useradd(struct torture_context *tctx,
diff --git a/source4/torture/libnet/utils.h b/source4/torture/libnet/utils.h
deleted file mode 100644
index 26350e3012..0000000000
--- a/source4/torture/libnet/utils.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   Test suite for libnet calls.
-
-   Copyright (C) Rafal Szczesniak 2007
-
-   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 3 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, see <http://www.gnu.org/licenses/>.
-*/
-
-
-bool test_domain_open(struct torture_context *tctx,
-		     struct dcerpc_binding_handle *b,
-		     struct lsa_String *domname,
-		     TALLOC_CTX *mem_ctx,
-		     struct policy_handle *_domain_handle,
-		     struct dom_sid2 *_dom_sid);
-
-bool test_user_create(struct torture_context *tctx,
-		      struct dcerpc_binding_handle *b,
-		      TALLOC_CTX *mem_ctx,
-		      struct policy_handle *handle, const char *name,
-		      uint32_t *rid);
-
-bool test_user_cleanup(struct torture_context *tctx,
-		       struct dcerpc_binding_handle *b,
-		       TALLOC_CTX *mem_ctx,
-		       struct policy_handle *domain_handle,
-		       const char *name);
-
-bool test_group_create(struct torture_context *tctx,
-		       struct dcerpc_binding_handle *b,
-		       TALLOC_CTX *mem_ctx,
-		       struct policy_handle *handle, const char *name,
-		       uint32_t *rid);
-
-bool test_group_cleanup(struct torture_context *tctx,
-			struct dcerpc_binding_handle *b,
-			TALLOC_CTX *mem_ctx,
-			struct policy_handle *domain_handle,
-			const char *name);
-
-bool test_samr_close_handle(struct torture_context *tctx,
-			    struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx,
-			    struct policy_handle *samr_handle);
-
-void msg_handler(struct monitor_msg *m);