This looks like a big change but really isn't.

It is changing the global variables "myname" and "myworkgroup"
to "global_myname" and "global_myworkgroup" respectively.

This is to make it very explicit when we are messing
with a global (don't ask - it makes the domain client
code much clearer :-).

Jeremy.
(This used to be commit 866406bfe399cf757c8275093dacd5ce4843afa0)

3 files changed, 7 insertions, 10 deletions

diff --git a/source3/rpc_server/srv_netlog.c b/source3/rpc_server/srv_netlog.c
index eb4dfb4a264..6aa1cd707e5 100644
--- a/source3/rpc_server/srv_netlog.c
+++ b/source3/rpc_server/srv_netlog.c
@@ -30,8 +30,7 @@ extern int DEBUGLEVEL;
 
 extern BOOL sam_logon_in_ssb;
 extern pstring samlogon_user;
-
-
+extern pstring global_myname;
 
 /*************************************************************************
  make_net_r_req_chal:
@@ -683,7 +682,6 @@ static void api_net_sam_logon( int uid,
 		pstring domain_groups;
 		pstring dom_sid;
 		pstring other_sids;
-		extern pstring myname;
 		uint32 r_uid;
 		uint32 r_gid;
 
@@ -706,7 +704,7 @@ static void api_net_sam_logon( int uid,
 		pstrcpy(home_drive  , lp_logon_drive      ());
 		pstrcpy(home_dir    , lp_logon_home       ());
 
-		pstrcpy(my_name     , myname                );
+		pstrcpy(my_name     , global_myname         );
 		strupper(my_name);
 
 		get_domain_user_groups(domain_groups, samlogon_user);
diff --git a/source3/rpc_server/srv_srvsvc.c b/source3/rpc_server/srv_srvsvc.c
index 236b70dc82e..d06e2ac6600 100644
--- a/source3/rpc_server/srv_srvsvc.c
+++ b/source3/rpc_server/srv_srvsvc.c
@@ -27,7 +27,7 @@
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
-
+extern pstring global_myname;
 
 /*******************************************************************
  fill in a share info level 1 structure.
@@ -858,7 +858,6 @@ static void srv_reply_net_srv_get_info(SRV_Q_NET_SRV_GET_INFO *q_n,
 	uint32 status = 0x0;
 	SRV_INFO_CTR ctr;
 
-	extern pstring myname;
 
 	DEBUG(5,("srv_net_srv_get_info: %d\n", __LINE__));
 
@@ -867,7 +866,7 @@ static void srv_reply_net_srv_get_info(SRV_Q_NET_SRV_GET_INFO *q_n,
 		case 102:
 		{
 			make_srv_info_102(&ctr.srv.sv102,
-			                  500, myname, lp_serverstring(),
+			                  500, global_myname, lp_serverstring(),
 			                  5, 4, /* major/minor version - NT 5.4 :-) */
 			                  0x4100b, /* browsing stuff SV_TYPE_XXXX */
 			                  0xffffffff, /* users */
@@ -882,7 +881,7 @@ static void srv_reply_net_srv_get_info(SRV_Q_NET_SRV_GET_INFO *q_n,
 		case 101:
 		{
 			make_srv_info_101(&ctr.srv.sv101,
-			                  500, myname,
+			                  500, global_myname,
 			                  5, 4, /* major/minor version - NT 5.4 :-) */
 			                  0x4100b, /* browsing stuff SV_TYPE_XXXX */
 			                  lp_serverstring());
diff --git a/source3/rpc_server/srv_wkssvc.c b/source3/rpc_server/srv_wkssvc.c
index 8a8647d0a91..5bea006b2cd 100644
--- a/source3/rpc_server/srv_wkssvc.c
+++ b/source3/rpc_server/srv_wkssvc.c
@@ -27,6 +27,7 @@
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
+extern pstring global_myname;
 
 
 /*******************************************************************
@@ -34,13 +35,12 @@ extern int DEBUGLEVEL;
  ********************************************************************/
 static void create_wks_info_100(WKS_INFO_100 *inf)
 {
-	extern pstring myname;
 	pstring my_name;
 	pstring domain;
 
 	DEBUG(5,("create_wks_info_100: %d\n", __LINE__));
 
-	pstrcpy (my_name, myname);
+	pstrcpy (my_name, global_myname);
 	strupper(my_name);
 
 	pstrcpy (domain , lp_workgroup());