s3-param Remove special case for global_myname(), rename to lp_netbios_name()

There is no reason this can't be a normal constant string in the
loadparm system, now that we have lp_set_cmdline() to handle overrides
correctly.

Andrew Bartlett

1 files changed, 12 insertions, 12 deletions

diff --git a/source3/nmbd/nmbd_sendannounce.c b/source3/nmbd/nmbd_sendannounce.c
index b389c02278..847390b615 100644
--- a/source3/nmbd/nmbd_sendannounce.c
+++ b/source3/nmbd/nmbd_sendannounce.c
@@ -50,7 +50,7 @@ void send_browser_reset(int reset_type, const char *to_name, int to_type, struct
 	p++;
 
 	send_mailslot(True, BROWSE_MAILSLOT, outbuf,PTR_DIFF(p,outbuf),
-		global_myname(), 0x0, to_name, to_type, to_ip, 
+		lp_netbios_name(), 0x0, to_name, to_type, to_ip,
 		FIRST_SUBNET->myip, DGRAM_PORT);
 }
 
@@ -76,10 +76,10 @@ to subnet %s\n", work->work_group, subrec->subnet_name));
 
 	SCVAL(p,0,work->token); /* (local) Unique workgroup token id. */
 	p++;
-	p +=  push_string_check(p+1, global_myname(), 15, STR_ASCII|STR_UPPER|STR_TERMINATE);
+	p +=  push_string_check(p+1, lp_netbios_name(), 15, STR_ASCII|STR_UPPER|STR_TERMINATE);
   
 	send_mailslot(False, BROWSE_MAILSLOT, outbuf,PTR_DIFF(p,outbuf),
-		global_myname(), 0x0, work->work_group,0x1e, subrec->bcast_ip, 
+		lp_netbios_name(), 0x0, work->work_group,0x1e, subrec->bcast_ip,
 		subrec->myip, DGRAM_PORT);
 }
 
@@ -164,14 +164,14 @@ static void send_local_master_announcement(struct subnet_record *subrec, struct
 	uint32 type = servrec->serv.type & ~SV_TYPE_LOCAL_LIST_ONLY;
 
 	DEBUG(3,("send_local_master_announcement: type %x for name %s on subnet %s for workgroup %s\n",
-		type, global_myname(), subrec->subnet_name, work->work_group));
+		type, lp_netbios_name(), subrec->subnet_name, work->work_group));
 
 	send_announcement(subrec, ANN_LocalMasterAnnouncement,
-			global_myname(),                 /* From nbt name. */
+			lp_netbios_name(),                 /* From nbt name. */
 			work->work_group, 0x1e,          /* To nbt name. */
 			subrec->bcast_ip,                /* To ip. */
 			work->announce_interval,         /* Time until next announce. */
-			global_myname(),                 /* Name to announce. */
+			lp_netbios_name(),                 /* Name to announce. */
 			type,                            /* Type field. */
 			servrec->serv.comment);
 }
@@ -186,13 +186,13 @@ static void send_workgroup_announcement(struct subnet_record *subrec, struct wor
 		subrec->subnet_name, work->work_group));
 
 	send_announcement(subrec, ANN_DomainAnnouncement,
-			global_myname(),                 /* From nbt name. */
+			lp_netbios_name(),                 /* From nbt name. */
 			MSBROWSE, 0x1,                   /* To nbt name. */
 			subrec->bcast_ip,                /* To ip. */
 			work->announce_interval,         /* Time until next announce. */
 			work->work_group,                /* Name to announce. */
 			SV_TYPE_DOMAIN_ENUM|SV_TYPE_NT,  /* workgroup announce flags. */
-			global_myname());                /* From name as comment. */
+			lp_netbios_name());                /* From name as comment. */
 }
 
 /****************************************************************************
@@ -251,7 +251,7 @@ static void announce_server(struct subnet_record *subrec, struct work_record *wo
 	/* Only do domain announcements if we are a master and it's
 		our primary name we're being asked to announce. */
 
-	if (AM_LOCAL_MASTER_BROWSER(work) && strequal(global_myname(),servrec->serv.name)) {
+	if (AM_LOCAL_MASTER_BROWSER(work) && strequal(lp_netbios_name(),servrec->serv.name)) {
 		send_local_master_announcement(subrec, work, servrec);
 		send_workgroup_announcement(subrec, work);
 	} else {
@@ -566,7 +566,7 @@ for workgroup %s on subnet %s.\n", lp_workgroup(), FIRST_SUBNET->subnet_name ));
 	SCVAL(p,0,ANN_MasterAnnouncement);
 	p++;
 
-	unstrcpy(myname, global_myname());
+	unstrcpy(myname, lp_netbios_name());
 	strupper_m(myname);
 	myname[15]='\0';
 	push_ascii(p, myname, sizeof(outbuf)-PTR_DIFF(p,outbuf)-1, STR_TERMINATE);
@@ -579,10 +579,10 @@ for workgroup %s on subnet %s.\n", lp_workgroup(), FIRST_SUBNET->subnet_name ));
 		addr = interpret_addr2(s2);
 
 		DEBUG(5,("announce_remote: Doing remote browse sync announce for server %s to IP %s.\n",
-			global_myname(), inet_ntoa(addr) ));
+			lp_netbios_name(), inet_ntoa(addr) ));
 
 		send_mailslot(True, BROWSE_MAILSLOT, outbuf,PTR_DIFF(p,outbuf),
-			global_myname(), 0x0, "*", 0x0, addr, FIRST_SUBNET->myip, DGRAM_PORT);
+			lp_netbios_name(), 0x0, "*", 0x0, addr, FIRST_SUBNET->myip, DGRAM_PORT);
 	}
 	TALLOC_FREE(frame);
 }