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

[nivanova/samba-autobuild/.git] / source3 / nmbd / nmbd_elections.c

diff --git a/source3/nmbd/nmbd_elections.c b/source3/nmbd/nmbd_elections.c
index 4340f66096541ef644cc12917c9fcf7b27025ad8..ac0d8735120c36c6b6c6c288223e58ed12079e42 100644 (file)
--- a/source3/nmbd/nmbd_elections.c
+++ b/source3/nmbd/nmbd_elections.c
@@ -57,7 +57,7 @@ static void send_election_dgram(struct subnet_record *subrec, const char *workgr
        p = skip_string(outbuf,sizeof(outbuf),p);
 
        send_mailslot(False, BROWSE_MAILSLOT, outbuf, PTR_DIFF(p,outbuf),
-               global_myname(), 0,
+               lp_netbios_name(), 0,
                workgroup_name, 0x1e,
                subrec->bcast_ip, subrec->myip, DGRAM_PORT);
 }
@@ -194,7 +194,7 @@ yet registered on subnet %s\n", nmb_namestr(&nmbname), subrec->subnet_name ));
                                }
 
                                send_election_dgram(subrec, work->work_group, work->ElectionCriterion,
-                                               t - StartupTime, global_myname());
+                                               t - StartupTime, lp_netbios_name());
              
                                if (work->ElectionCount++ >= 4) {
                                        /* Won election (4 packets were sent out uncontested. */
@@ -231,7 +231,7 @@ static bool win_election(struct work_record *work, int version,
                        version, ELECTION_VERSION,
                        criterion, mycriterion,
                        timeup, mytimeup,
-                       server_name, global_myname()));
+                       server_name, lp_netbios_name()));
 
        if (version > ELECTION_VERSION)
                return(False);
@@ -248,7 +248,7 @@ static bool win_election(struct work_record *work, int version,
        if (timeup < mytimeup)
                return(True);
 
-       if (strcasecmp_m(global_myname(), server_name) > 0)
+       if (strcasecmp_m(lp_netbios_name(), server_name) > 0)
                return(False);
   
        return(True);