From c857c031705ccd406d9d3749c247e49206bdd6b3 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 7 Mar 2005 12:27:03 +0000
Subject: [PATCH] r5681: fix the build and compiler wanings

metze
(This used to be commit bb2622a0c94127a31855adc41d90289219a1ddd7)
---
 source4/libnet/config.mk          | 3 ++-
 source4/torture/libnet/userinfo.c | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index e815193f48e..31714058f2f 100644
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -8,7 +8,8 @@ ADD_OBJ_FILES = \
 		libnet/libnet_time.o \
 		libnet/libnet_rpc.o \
 		libnet/libnet_join.o \
-		libnet/libnet_user.o
+		libnet/libnet_user.o \
+		libnet/userinfo.o
 REQUIRED_SUBSYSTEMS = RPC_NDR_SAMR RPC_NDR_SRVSVC
 # End SUBSYSTEM LIBNET
 #################################
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index b0767836622..c541474a751 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -80,7 +80,7 @@ static BOOL test_opendomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 
 static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-			 struct policy_handle *domain_handle, char *username)
+			 struct policy_handle *domain_handle, const char *username)
 {
 	NTSTATUS status;
 	struct samr_LookupNames r1;
@@ -180,13 +180,12 @@ static BOOL test_create(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 static BOOL test_userinfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			  struct policy_handle *domain_handle,
-			  struct dom_sid2 *domain_sid, char* user_name,
+			  struct dom_sid2 *domain_sid, const char* user_name,
 			  uint32_t *rid)
 {
 	NTSTATUS status;
 	struct rpc_composite_userinfo user;
 	struct dom_sid *user_sid;
-	char *name;
 
 	user_sid = dom_sid_add_rid(mem_ctx, domain_sid, *rid);
 
@@ -213,7 +212,7 @@ BOOL torture_userinfo(void)
 	struct dcerpc_binding b;
 	TALLOC_CTX *mem_ctx;
 	BOOL ret = True;
-	struct policy_handle h, user_handle;
+	struct policy_handle h;
 	struct samr_String name;
 	struct dom_sid2 sid;
 	uint32_t rid;