4 files changed, 1 insertions, 5 deletions
diff --git a/source3/rpc_client/cli_login.c b/source3/rpc_client/cli_login.c
index e18062220b..3ce22fd854 100644
--- a/source3/rpc_client/cli_login.c
+++ b/source3/rpc_client/cli_login.c
@@ -24,8 +24,6 @@
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
-extern fstring global_myworkgroup;
-extern pstring global_myname;
 
 /****************************************************************************
 Initialize domain session credentials.
diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 5255732c5d..a43b65ad64 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -193,7 +193,7 @@ BOOL do_lsa_lookup_sids(struct cli_state *cli,
 				fstrcpy(dom_name, unistr2(ref.ref_dom[dom_idx].uni_dom_name.buffer));
 				fstrcpy(name    , unistr2(t_names.uni_name[i].buffer));
 				
-				slprintf(full_name, sizeof(full_name)-1, "\\%s\\%s",
+				slprintf(full_name, sizeof(full_name), "\\%s\\%s",
 				         dom_name, name);
 
 				(*names)[i] = strdup(full_name);
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index d75ad6947f..ed2f391256 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -32,7 +32,6 @@
 extern int DEBUGLEVEL;
 extern pstring scope;
 extern pstring global_myname;
-extern fstring global_myworkgroup;
 
 /****************************************************************************
 Generate the next creds to use.
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 579eeebdac..712e608847 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -31,7 +31,6 @@
 
 extern int DEBUGLEVEL;
 extern struct pipe_id_info pipe_names[];
-extern fstring global_myworkgroup;
 extern pstring global_myname;
 
 /********************************************************************