param: rename lp function and variable from 'piddir' to 'pid_directory'

[samba.git] / source3 / nmbd / nmbd_become_dmb.c

diff --git a/source3/nmbd/nmbd_become_dmb.c b/source3/nmbd/nmbd_become_dmb.c
index fb87927436d745b60f04202ca40688e6038cc56f..a3b3d585ce96a13c85cc3b5dbfb6ef3bab1996c1 100644 (file)
--- a/source3/nmbd/nmbd_become_dmb.c
+++ b/source3/nmbd/nmbd_become_dmb.c
@@ -21,6 +21,8 @@
 */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
+#include "nmbd/nmbd.h"
 
 extern uint16 samba_nb_type; /* Samba's NetBIOS type. */
 
@@ -49,10 +51,10 @@ workgroup %s on subnet %s\n", failname, subrec->subnet_name));
        /* Set the state back to DOMAIN_NONE. */
        work->dom_state = DOMAIN_NONE;
 
-       if((servrec = find_server_in_workgroup( work, global_myname())) == NULL) {
+       if((servrec = find_server_in_workgroup( work, lp_netbios_name())) == NULL) {
                DEBUG(0,("become_domain_master_fail: Error - cannot find server %s \
 in workgroup %s on subnet %s\n",
-                       global_myname(), work->work_group, subrec->subnet_name));
+                       lp_netbios_name(), work->work_group, subrec->subnet_name));
                return;
        }
 
@@ -90,10 +92,10 @@ workgroup %s on subnet %s\n", regname, subrec->subnet_name));
                return;
        }
 
-       if((servrec = find_server_in_workgroup( work, global_myname())) == NULL) {
+       if((servrec = find_server_in_workgroup( work, lp_netbios_name())) == NULL) {
                DEBUG(0,("become_domain_master_stage2: Error - cannot find server %s \
 in workgroup %s on subnet %s\n", 
-               global_myname(), regname, subrec->subnet_name));
+               lp_netbios_name(), regname, subrec->subnet_name));
                work->dom_state = DOMAIN_NONE;
                return;
        }
@@ -108,7 +110,7 @@ in workgroup %s on subnet %s\n",
        subrec->work_changed = True;
 
        if( DEBUGLVL( 0 ) ) {
-               dbgtext( "*****\n\nSamba server %s ", global_myname() );
+               dbgtext( "*****\n\nSamba server %s ", lp_netbios_name() );
                dbgtext( "is now a domain master browser for " );
                dbgtext( "workgroup %s ", work->work_group );
                dbgtext( "on subnet %s\n\n*****\n", subrec->subnet_name );
@@ -124,11 +126,12 @@ in workgroup %s on subnet %s\n",
                   will stop us syncing with ourself if we are also
                   a local master browser. */
 
-               make_nmb_name(&nmbname, global_myname(), 0x20);
+               make_nmb_name(&nmbname, lp_netbios_name(), 0x20);
 
                work->dmb_name = nmbname;
 
-               /* Pick the first interface IPv4 address as the domain master browser ip. */
+               /* Pick the first interface IPv4 address as the domain master
+                * browser ip. */
                nip = first_ipv4_iface();
                if (!nip) {
                        DEBUG(0,("become_domain_master_stage2: "
@@ -219,7 +222,7 @@ static void become_domain_master_query_success(struct subnet_record *subrec,
 
        allones_ip.s_addr = htonl(INADDR_BROADCAST);
 
-       if(ismyip_v4(ip) || ip_equal(allones_ip, ip) || is_zero_ip_v4(ip)) {
+       if(ismyip_v4(ip) || ip_equal_v4(allones_ip, ip) || is_zero_ip_v4(ip)) {
                if( DEBUGLVL( 3 ) ) {
                        dbgtext( "become_domain_master_query_success():\n" );
                        dbgtext( "Our address (%s) ", inet_ntoa(ip) );
@@ -372,7 +375,7 @@ void add_domain_names(time_t t)
        lastrun = t;
 
        /* Do the "internet group" - <1c> names. */
-       if (lp_domain_logons())
+       if (IS_DC)
                add_logon_names();
 
        /* Do the domain master names. */