Changeset 988 for vendor/current/source3/nmbd

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/source3/nmbd

Files:

• asyncdns.c (modified) (9 diffs)
• nmbd.c (modified) (31 diffs)
• nmbd_become_dmb.c (modified) (7 diffs)
• nmbd_become_lmb.c (modified) (14 diffs)
• nmbd_browserdb.c (modified) (2 diffs)
• nmbd_browsesync.c (modified) (12 diffs)
• nmbd_elections.c (modified) (12 diffs)
• nmbd_incomingdgrams.c (modified) (31 diffs)
• nmbd_incomingrequests.c (modified) (4 diffs)
• nmbd_lmhosts.c (modified) (1 diff)
• nmbd_logonnames.c (modified) (4 diffs)
• nmbd_mynames.c (modified) (2 diffs)
• nmbd_namelistdb.c (modified) (10 diffs)
• nmbd_nameregister.c (modified) (8 diffs)
• nmbd_packets.c (modified) (34 diffs)
• nmbd_processlogon.c (modified) (18 diffs)
• nmbd_proto.h (modified) (13 diffs)
• nmbd_responserecordsdb.c (modified) (3 diffs)
• nmbd_sendannounce.c (modified) (14 diffs)
• nmbd_serverlistdb.c (modified) (16 diffs)
• nmbd_subnetdb.c (modified) (3 diffs)
• nmbd_synclists.c (modified) (14 diffs)
• nmbd_winsproxy.c (modified) (1 diff)
• nmbd_winsserver.c (modified) (35 diffs)
• nmbd_workgroupdb.c (modified) (3 diffs)

vendor/current/source3/nmbd/asyncdns.c

@@ -3 +3 @@
    a async DNS handler
    Copyright (C) Andrew Tridgell 1997-1998
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -20 +20 @@
 #include "includes.h"
 #include "nmbd/nmbd.h"
+#include "lib/util/sys_rw_data.h"
 
 /***************************************************************************
@@ -31 +32 @@
 
         pull_ascii_nstring(qname, sizeof(qname), question->name);
-  
+
         if (!addr.s_addr) {
                 /* add the fail to WINS cache of names. give it 1 hour in the cache */
@@ -91 +92 @@
                 NTSTATUS status;
 
-                status = read_data(fd_in, (char *)&r, sizeof(r));
+                status = read_data_ntstatus(fd_in, (char *)&r, sizeof(r));
 
                 if (!NT_STATUS_IS_OK(status)) {
@@ -136 +137 @@
   create a child process to handle DNS lookups
   ****************************************************************************/
-void start_async_dns(void)
+void start_async_dns(struct messaging_context *msg)
 {
         int fd1[2], fd2[2];
@@ -148 +149 @@
         }
 
-        child_pid = sys_fork();
+        child_pid = fork();
 
         if (child_pid) {
@@ -167 +168 @@
         CatchSignal(SIGTERM, sig_term);
 
-        status = reinit_after_fork(nmbd_messaging_context(),
-                                   nmbd_event_context(),
-                                   procid_self(), true);
+        status = reinit_after_fork(msg, nmbd_event_context(), true, NULL);
 
         if (!NT_STATUS_IS_OK(status)) {
@@ -206 +205 @@
   check the DNS queue
   ****************************************************************************/
-void run_dns_queue(void)
+void run_dns_queue(struct messaging_context *msg)
 {
         struct query_record r;
@@ -219 +218 @@
                 close(fd_in);
                 close(fd_out);
-                start_async_dns();
-        }
-
-        status = read_data(fd_in, (char *)&r, sizeof(r));
+                start_async_dns(msg);
+        }
+
+        status = read_data_ntstatus(fd_in, (char *)&r, sizeof(r));
 
         if (!NT_STATUS_IS_OK(status)) {

vendor/current/source3/nmbd/nmbd.c

@@ -26 +26 @@
 #include "serverid.h"
 #include "messages.h"
+#include "../lib/util/pidfile.h"
+#include "util_cluster.h"
 
 int ClientNMB       = -1;
@@ -43 +45 @@
 time_t StartupTime = 0;
 
-struct event_context *nmbd_event_context(void)
+struct tevent_context *nmbd_event_context(void)
 {
         return server_event_context();
-}
-
-struct messaging_context *nmbd_messaging_context(void)
-{
-        struct messaging_context *msg_ctx = server_messaging_context();
-        if (likely(msg_ctx != NULL)) {
-                return msg_ctx;
-        }
-        smb_panic("Could not init nmbd's messaging context.\n");
-        return NULL;
 }
 
@@ -62 +54 @@
  **************************************************************************** */
 
-static void terminate(void)
+static void terminate(struct messaging_context *msg)
 {
         DEBUG(0,("Got SIGTERM: going down...\n"));
-  
+
         /* Write out wins.dat file if samba is a WINS server */
         wins_write_database(0,False);
-  
+
         /* Remove all SELF registered names from WINS */
         release_wins_names();
-  
+
         /* Announce all server entries as 0 time-to-live, 0 type. */
         announce_my_servers_removed();
@@ -79 +71 @@
 
         gencache_stabilize();
-        serverid_deregister(procid_self());
-
-        pidfile_unlink();
+        serverid_deregister(messaging_server_id(msg));
+
+        pidfile_unlink(lp_pid_directory(), "nmbd");
 
         exit(0);
@@ -93 +85 @@
                                   void *private_data)
 {
-        terminate();
-}
-
-static bool nmbd_setup_sig_term_handler(void)
+        struct messaging_context *msg = talloc_get_type_abort(
+                private_data, struct messaging_context);
+
+        terminate(msg);
+}
+
+/*
+  handle stdin becoming readable when we are in --foreground mode
+ */
+static void nmbd_stdin_handler(struct tevent_context *ev,
+                               struct tevent_fd *fde,
+                               uint16_t flags,
+                               void *private_data)
+{
+        char c;
+        if (read(0, &c, 1) != 1) {
+                struct messaging_context *msg = talloc_get_type_abort(
+                        private_data, struct messaging_context);
+                
+                DEBUG(0,("EOF on stdin\n"));
+                terminate(msg);
+        }
+}
+
+static bool nmbd_setup_sig_term_handler(struct messaging_context *msg)
 {
         struct tevent_signal *se;
@@ -104 +117 @@
                                SIGTERM, 0,
                                nmbd_sig_term_handler,
-                               NULL);
+                               msg);
         if (!se) {
                 DEBUG(0,("failed to setup SIGTERM handler"));
                 return false;
+        }
+
+        return true;
+}
+
+static bool nmbd_setup_stdin_handler(struct messaging_context *msg, bool foreground)
+{
+        if (foreground) {
+                /* if we are running in the foreground then look for
+                   EOF on stdin, and exit if it happens. This allows
+                   us to die if the parent process dies
+                   Only do this on a pipe or socket, no other device.
+                */
+                struct stat st;
+                if (fstat(0, &st) != 0) {
+                        return false;
+                }
+                if (S_ISFIFO(st.st_mode) || S_ISSOCK(st.st_mode)) {
+                        tevent_add_fd(nmbd_event_context(),
+                                nmbd_event_context(),
+                                0,
+                                TEVENT_FD_READ,
+                                nmbd_stdin_handler,
+                                msg);
+                }
         }
 
@@ -126 +164 @@
                                  void *private_data)
 {
+        struct messaging_context *msg = talloc_get_type_abort(
+                private_data, struct messaging_context);
+
         DEBUG(0,("Got SIGHUP dumping debug info.\n"));
-        msg_reload_nmbd_services(nmbd_messaging_context(),
-                                 NULL, MSG_SMB_CONF_UPDATED,
-                                 procid_self(), NULL);
-}
-
-static bool nmbd_setup_sig_hup_handler(void)
+        msg_reload_nmbd_services(msg, NULL, MSG_SMB_CONF_UPDATED,
+                                 messaging_server_id(msg), NULL);
+}
+
+static bool nmbd_setup_sig_hup_handler(struct messaging_context *msg)
 {
         struct tevent_signal *se;
@@ -140 +180 @@
                                SIGHUP, 0,
                                nmbd_sig_hup_handler,
-                               NULL);
+                               msg);
         if (!se) {
                 DEBUG(0,("failed to setup SIGHUP handler"));
@@ -159 +199 @@
                            DATA_BLOB *data)
 {
-        terminate();
-}
-
-/**************************************************************************** **
- Possibly continue after a fault.
- **************************************************************************** */
-
-static void fault_continue(void)
-{
-        dump_core();
+        terminate(msg);
 }
 
@@ -178 +209 @@
 {
         static time_t lastrun = 0;
-  
+
         if ( !lastrun )
                 lastrun = t;
@@ -250 +281 @@
                 }
 
-                ip = ((struct sockaddr_in *)(void *)&iface->ip)->sin_addr;
-                nmask = ((struct sockaddr_in *)(void *)
+                ip = ((const struct sockaddr_in *)(const void *)&iface->ip)->sin_addr;
+                nmask = ((const struct sockaddr_in *)(const void *)
                          &iface->netmask)->sin_addr;
 
@@ -260 +291 @@
                  */
 
-                if (is_loopback_addr((struct sockaddr *)(void *)&iface->ip)) {
+                if (is_loopback_addr((const struct sockaddr *)(const void *)&iface->ip)) {
                         DEBUG(2,("reload_interfaces: Ignoring loopback "
                                 "interface %s\n",
@@ -366 +397 @@
 
         if ( lp_loaded() ) {
-                char *fname = lp_configfile();
+                char *fname = lp_next_configfile(talloc_tos());
                 if (file_exist(fname) && !strcsequal(fname,get_dyn_CONFIGFILE())) {
                         set_dyn_CONFIGFILE(fname);
@@ -377 +408 @@
                 return(True);
 
-        ret = lp_load(get_dyn_CONFIGFILE(), True , False, False, True);
+        ret = lp_load_global(get_dyn_CONFIGFILE());
 
         /* perhaps the config filename is now set */
@@ -384 +415 @@
                 reload_nmbd_services( True );
         }
+
+        reopen_logs();
 
         return(ret);
@@ -470 +503 @@
  **************************************************************************** */
 
-static void process(void)
+static void process(struct messaging_context *msg)
 {
         bool run_election;
@@ -491 +524 @@
                  */
 
-                if(listen_for_packets(run_election)) {
+                if (listen_for_packets(msg, run_election)) {
                         TALLOC_FREE(frame);
                         return;
@@ -675 +708 @@
 {
         struct sockaddr_storage ss;
-        const char *sock_addr = lp_socket_address();
+        const char *sock_addr = lp_nbt_client_socket_address();
 
         /*
@@ -741 +774 @@
  int main(int argc, const char *argv[])
 {
-        static bool is_daemon;
-        static bool opt_interactive;
-        static bool Fork = true;
-        static bool no_process_group;
-        static bool log_stdout;
+        bool is_daemon = false;
+        bool opt_interactive = false;
+        bool Fork = true;
+        bool no_process_group = false;
+        bool log_stdout = false;
         poptContext pc;
         char *p_lmhosts = NULL;
         int opt;
+        struct messaging_context *msg;
         enum {
                 OPT_DAEMON = 1000,
@@ -770 +804 @@
         TALLOC_CTX *frame;
         NTSTATUS status;
+        bool ok;
 
         /*
@@ -777 +812 @@
         frame = talloc_stackframe();
 
-        load_case_tables();
+        /*
+         * We want total control over the permissions on created files,
+         * so set our umask to 0.
+         */
+        umask(0);
+
+        setup_logging(argv[0], DEBUG_DEFAULT_STDOUT);
+
+        smb_init_locale();
 
         global_nmb_port = NMB_PORT;
@@ -809 +852 @@
 
         global_in_nmbd = true;
-        
+
         StartupTime = time(NULL);
-        
-        sys_srandom(time(NULL) ^ sys_getpid());
-        
+
+        sys_srandom(time(NULL) ^ getpid());
+
         if (!override_logfile) {
                 char *lfile = NULL;
@@ -822 +865 @@
                 SAFE_FREE(lfile);
         }
-        
-        fault_setup((void (*)(void *))fault_continue );
-        dump_core_setup("nmbd");
-        
+
+        fault_setup();
+        dump_core_setup("nmbd", lp_logfile(talloc_tos()));
+
         /* POSIX demands that signals are inherited. If the invoking process has
          * these signals masked, we will have problems, as we won't receive them. */
@@ -842 +885 @@
 #endif
 
+        /* Ignore children - no zombies. */
+        CatchChild();
+
         if ( opt_interactive ) {
                 Fork = False;
@@ -851 +897 @@
                 exit(1);
         }
+
         if (log_stdout) {
-                setup_logging( argv[0], DEBUG_STDOUT);
+                setup_logging(argv[0], DEBUG_STDOUT);
         } else {
                 setup_logging( argv[0], DEBUG_FILE);
@@ -863 +910 @@
 
         if (!lp_load_initial_only(get_dyn_CONFIGFILE())) {
-                DEBUG(0, ("error opening config file\n"));
+                DEBUG(0, ("error opening config file '%s'\n", get_dyn_CONFIGFILE()));
                 exit(1);
         }
 
-        if (nmbd_messaging_context() == NULL) {
+        reopen_logs();
+
+        if (lp_server_role() == ROLE_ACTIVE_DIRECTORY_DC
+            && !lp_parm_bool(-1, "server role check", "inhibit", false)) {
+                /* TODO: when we have a merged set of defaults for
+                 * loadparm, we could possibly check if the internal
+                 * nbt server is in the list, and allow a startup if disabled */
+                DEBUG(0, ("server role = 'active directory domain controller' not compatible with running nmbd standalone. \n"));
+                DEBUGADD(0, ("You should start 'samba' instead, and it will control starting the internal nbt server\n"));
+                exit(1);
+        }
+
+        if (!cluster_probe_ok()) {
+                exit(1);
+        }
+
+        msg = messaging_init(NULL, server_event_context());
+        if (msg == NULL) {
                 return 1;
         }
@@ -887 +951 @@
 
         if (!is_daemon && !is_a_socket(0)) {
-                DEBUG(0,("standard input is not a socket, assuming -D option\n"));
+                DEBUG(3, ("standard input is not a socket, assuming -D option\n"));
                 is_daemon = True;
         }
-  
+
         if (is_daemon && !opt_interactive) {
-                DEBUG( 2, ( "Becoming a daemon.\n" ) );
+                DEBUG(3, ("Becoming a daemon.\n"));
                 become_daemon(Fork, no_process_group, log_stdout);
         }
@@ -905 +969 @@
 #endif
 
-        if (nmbd_messaging_context() == NULL) {
-                return 1;
-        }
-
 #ifndef SYNC_DNS
         /* Setup the async dns. We do it here so it doesn't have all the other
                 stuff initialised and thus chewing memory and sockets */
-        if(lp_we_are_a_wins_server() && lp_dns_proxy()) {
-                start_async_dns();
+        if(lp_we_are_a_wins_server() && lp_wins_dns_proxy()) {
+                start_async_dns(msg);
         }
 #endif
 
-        if (!directory_exist(lp_lockdir())) {
-                mkdir(lp_lockdir(), 0755);
-        }
-
-        pidfile_create("nmbd");
-
-        status = reinit_after_fork(nmbd_messaging_context(),
-                                   nmbd_event_context(),
-                                   procid_self(), false);
+        ok = directory_create_or_exist(lp_lock_directory(), 0755);
+        if (!ok) {
+                exit_daemon("Failed to create directory for lock files, check 'lock directory'", errno);
+        }
+
+        ok = directory_create_or_exist(lp_pid_directory(), 0755);
+        if (!ok) {
+                exit_daemon("Failed to create directory for pid files, check 'pid directory'", errno);
+        }
+
+        pidfile_create(lp_pid_directory(), "nmbd");
+
+        status = reinit_after_fork(msg, nmbd_event_context(), false, NULL);
 
         if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(0,("reinit_after_fork() failed\n"));
+                exit_daemon("reinit_after_fork() failed", map_errno_from_nt_status(status));
+        }
+
+        /*
+         * Do not initialize the parent-child-pipe before becoming
+         * a daemon: this is used to detect a died parent in the child
+         * process.
+         */
+        status = init_before_fork();
+        if (!NT_STATUS_IS_OK(status)) {
+                exit_daemon(nt_errstr(status), map_errno_from_nt_status(status));
+        }
+
+        if (!nmbd_setup_sig_term_handler(msg))
+                exit_daemon("NMBD failed to setup signal handler", EINVAL);
+        if (!nmbd_setup_stdin_handler(msg, !Fork))
+                exit_daemon("NMBD failed to setup stdin handler", EINVAL);
+        if (!nmbd_setup_sig_hup_handler(msg))
+                exit_daemon("NMBD failed to setup SIGHUP handler", EINVAL);
+
+        if (!messaging_parent_dgm_cleanup_init(msg)) {
                 exit(1);
         }
 
-        if (!nmbd_setup_sig_term_handler())
-                exit(1);
-        if (!nmbd_setup_sig_hup_handler())
-                exit(1);
-
         /* get broadcast messages */
 
-        if (!serverid_register(procid_self(),
-                               FLAG_MSG_GENERAL|FLAG_MSG_DBWRAP)) {
-                DEBUG(1, ("Could not register myself in serverid.tdb\n"));
-                exit(1);
-        }
-
-        messaging_register(nmbd_messaging_context(), NULL,
-                           MSG_FORCE_ELECTION, nmbd_message_election);
+        if (!serverid_register(messaging_server_id(msg),
+                                FLAG_MSG_GENERAL |
+                                FLAG_MSG_NMBD |
+                                FLAG_MSG_DBWRAP)) {
+                exit_daemon("Could not register NMBD process in serverid.tdb", EACCES);
+        }
+
+        messaging_register(msg, NULL, MSG_FORCE_ELECTION,
+                           nmbd_message_election);
 #if 0
         /* Until winsrepl is done. */
-        messaging_register(nmbd_messaging_context(), NULL,
-                           MSG_WINS_NEW_ENTRY, nmbd_wins_new_entry);
+        messaging_register(msg, NULL, MSG_WINS_NEW_ENTRY,
+                           nmbd_wins_new_entry);
 #endif
-        messaging_register(nmbd_messaging_context(), NULL,
-                           MSG_SHUTDOWN, nmbd_terminate);
-        messaging_register(nmbd_messaging_context(), NULL,
-                           MSG_SMB_CONF_UPDATED, msg_reload_nmbd_services);
-        messaging_register(nmbd_messaging_context(), NULL,
-                           MSG_SEND_PACKET, msg_nmbd_send_packet);
+        messaging_register(msg, NULL, MSG_SHUTDOWN,
+                           nmbd_terminate);
+        messaging_register(msg, NULL, MSG_SMB_CONF_UPDATED,
+                           msg_reload_nmbd_services);
+        messaging_register(msg, NULL, MSG_SEND_PACKET,
+                           msg_nmbd_send_packet);
 
         TimeInit();
@@ -973 +1053 @@
         /* Create an nmbd subnet record for each of the above. */
         if( False == create_subnets() ) {
-                DEBUG(0,("ERROR: Failed when creating subnet lists. Exiting.\n"));
                 kill_async_dns_child();
-                exit(1);
+                exit_daemon("NMBD failed when creating subnet lists", EACCES);
         }
 
@@ -987 +1066 @@
         /* If we are acting as a WINS server, initialise data structures. */
         if( !initialise_wins() ) {
-                DEBUG( 0, ( "nmbd: Failed when initialising WINS server.\n" ) );
                 kill_async_dns_child();
-                exit(1);
+                exit_daemon( "NMBD failed when initialising WINS server.", EACCES);
         }
 
@@ -1001 +1079 @@
 
         if( False == register_my_workgroup_and_names() ) {
-                DEBUG(0,("ERROR: Failed when creating my my workgroup. Exiting.\n"));
                 kill_async_dns_child();
-                exit(1);
+                exit_daemon( "NMBD failed when creating my workgroup.", EACCES);
         }
 
         if (!initialize_nmbd_proxy_logon()) {
-                DEBUG(0,("ERROR: Failed setup nmbd_proxy_logon.\n"));
                 kill_async_dns_child();
-                exit(1);
+                exit_daemon( "NMBD failed to setup nmbd_proxy_logon.", EACCES);
         }
 
         if (!nmbd_init_packet_server()) {
                 kill_async_dns_child();
-                exit(1);
-        }
+                exit_daemon( "NMBD failed to setup packet server.", EACCES);
+        }
+
+        if (is_daemon && !opt_interactive) {
+                daemon_ready("nmbd");
+        }
 
         TALLOC_FREE(frame);
-        process();
+        process(msg);
 
         kill_async_dns_child();

vendor/current/source3/nmbd/nmbd_become_dmb.c

@@ -25 +25 @@
 #include "nmbd/nmbd.h"
 
-extern uint16 samba_nb_type; /* Samba's NetBIOS type. */
+extern uint16_t samba_nb_type; /* Samba's NetBIOS type. */
 
 static void become_domain_master_browser_bcast(const char *);
@@ -52 +52 @@
         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;
         }
@@ -77 +77 @@
                                         struct userdata_struct *userdata,
                                         struct nmb_name *registered_name,
-                                        uint16 nb_flags,
+                                        uint16_t nb_flags,
                                         int ttl, struct in_addr registered_ip)
 {
@@ -93 +93 @@
         }
 
-        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;
@@ -111 +111 @@
 
         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 );
@@ -127 +127 @@
                    a local master browser. */
 
-                make_nmb_name(&nmbname, global_myname(), 0x20);
+                make_nmb_name(&nmbname, lp_netbios_name(), 0x20);
 
                 work->dmb_name = nmbname;
@@ -376 +376 @@
 
         /* Do the "internet group" - <1c> names. */
-        if (lp_domain_logons())
+        if (IS_DC)
                 add_logon_names();
 

vendor/current/source3/nmbd/nmbd_become_lmb.c

@@ -25 +25 @@
 #include "../librpc/gen_ndr/svcctl.h"
 
-extern uint16 samba_nb_type; /* Samba's NetBIOS name type. */
+extern uint16_t samba_nb_type; /* Samba's NetBIOS name type. */
 
 /*******************************************************************
@@ -33 +33 @@
 
 void insert_permanent_name_into_unicast( struct subnet_record *subrec, 
-                                                struct nmb_name *nmbname, uint16 nb_type )
+                                                struct nmb_name *nmbname, uint16_t nb_type )
 {
         unstring name;
@@ -86 +86 @@
         }
 
-        if((servrec = find_server_in_workgroup( work, global_myname())) == NULL) {
+        if((servrec = find_server_in_workgroup( work, lp_netbios_name())) == NULL) {
                 DEBUG(0,("reset_workgroup_state: 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));
                 work->mst_state = lp_local_master() ? MST_POTENTIAL : MST_NONE;
                 return;
@@ -150 +150 @@
         if( DEBUGLVL( 0 ) ) {
                 dbgtext( "*****\n\n" );
-                dbgtext( "Samba name server %s ", global_myname() );
+                dbgtext( "Samba name server %s ", lp_netbios_name() );
                 dbgtext( "has stopped being a local master browser " );
                 dbgtext( "for workgroup %s ", relname );
@@ -186 +186 @@
         if( DEBUGLVL( 0 ) ) {
                 dbgtext( "*****\n\n" );
-                dbgtext( "Samba name server %s ", global_myname() );
+                dbgtext( "Samba name server %s ", lp_netbios_name() );
                 dbgtext( "has stopped being a local master browser " );
                 dbgtext( "for workgroup %s ", failname );
@@ -281 +281 @@
 on subnet %s\n",work->work_group, subrec->subnet_name));
   
-        if(find_server_in_workgroup( work, global_myname()) == NULL) {
+        if(find_server_in_workgroup( work, lp_netbios_name()) == NULL) {
                 DEBUG(0,("unbecome_local_master_browser: 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));
                         work->mst_state = lp_local_master() ? MST_POTENTIAL : MST_NONE;
                 return;
@@ -325 +325 @@
                                         struct userdata_struct *userdata,
                                         struct nmb_name *registered_name,
-                                        uint16 nb_flags,
+                                        uint16_t nb_flags,
                                         int ttl, struct in_addr registered_ip)
 {
@@ -343 +343 @@
         }
 
-        if((servrec = find_server_in_workgroup( work, global_myname())) == NULL) {
+        if((servrec = find_server_in_workgroup( work, lp_netbios_name())) == NULL) {
                 DEBUG(0,("become_local_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->mst_state = lp_local_master() ? MST_POTENTIAL : MST_NONE;
                 return;
@@ -364 +364 @@
 
         /* Add this name to the workgroup as local master browser. */
-        set_workgroup_local_master_browser_name( work, global_myname());
+        set_workgroup_local_master_browser_name( work, lp_netbios_name());
 
         /* Count the number of servers we have on our list. If it's
@@ -397 +397 @@
         if( DEBUGLVL( 0 ) ) {
                 dbgtext( "*****\n\n" );
-                dbgtext( "Samba name server %s ", global_myname() );
+                dbgtext( "Samba name server %s ", lp_netbios_name() );
                 dbgtext( "is now a local master browser " );
                 dbgtext( "for workgroup %s ", work->work_group );
@@ -438 +438 @@
                                         struct userdata_struct *userdata,
                                         struct nmb_name *registered_name,
-                                        uint16 nb_flags,
+                                        uint16_t nb_flags,
                                         int ttl, struct in_addr registered_ip)
 {
@@ -488 +488 @@
         }
 
-        if(find_server_in_workgroup(work, global_myname()) == NULL) {
+        if(find_server_in_workgroup(work, lp_netbios_name()) == NULL) {
                 DEBUG(0,("become_local_master_fail1: 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;
         }
@@ -528 +528 @@
         }
 
-        if(find_server_in_workgroup( work, global_myname()) == NULL) {
+        if(find_server_in_workgroup( work, lp_netbios_name()) == NULL) {
                 DEBUG(0,("become_local_master_browser: 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;
         }
@@ -555 +555 @@
         userdata->free_fn = NULL;
         userdata->userdata_len = strlen(work->work_group)+1;
-        overmalloc_safe_strcpy(userdata->data, work->work_group, size - sizeof(*userdata) - 1);
+        strlcpy(userdata->data, work->work_group, size - sizeof(*userdata));
 
         /* Register the special browser group name. */

vendor/current/source3/nmbd/nmbd_browserdb.c

@@ -110 +110 @@
         unstrcpy( browc->lmb_name, browser_name);
         unstrcpy( browc->work_group, work_name);
-        strupper_m( browc->lmb_name );
-        strupper_m( browc->work_group );
+        if (!strupper_m( browc->lmb_name )) {
+                SAFE_FREE(browc);
+                return NULL;
+        }
+        if (!strupper_m( browc->work_group )) {
+                SAFE_FREE(browc);
+                return NULL;
+        }
   
         browc->ip = ip;
  
-        DLIST_ADD_END(lmb_browserlist, browc, struct browse_cache_record *);
+        DLIST_ADD_END(lmb_browserlist, browc);
 
-        if( DEBUGLVL( 3 ) ) {
-                Debug1( "nmbd_browserdb:create_browser_in_lmb_cache()\n" );
-                Debug1( "  Added lmb cache entry for workgroup %s ", browc->work_group );
-                Debug1( "name %s IP %s ", browc->lmb_name, inet_ntoa(ip) );
-                Debug1( "ttl %d\n", (int)browc->death_time );
-        }
+        DEBUG(3, ("nmbd_browserdb:create_browser_in_lmb_cache()\n"));
+        DEBUGADD(3, ("  Added lmb cache entry for workgroup %s name %s IP %s "
+                     "ttl %d\n", browc->work_group, browc->lmb_name,
+                     inet_ntoa(ip), (int)browc->death_time));
   
         return( browc );
@@ -167 +171 @@
 
                 if( browc->death_time < t ) {
-                        if( DEBUGLVL( 3 ) ) {
-                                Debug1( "nmbd_browserdb:expire_lmb_browsers()\n" );
-                                Debug1( "  Removing timed out lmb entry %s\n", browc->lmb_name );
-                        }
+                        DEBUG(3, ("nmbd_browserdb:expire_lmb_browsers()\n"));
+                        DEBUGADD(3, ("  Removing timed out lmb entry %s\n",
+                                     browc->lmb_name));
                         remove_lmb_browser_entry( browc );
                 }

vendor/current/source3/nmbd/nmbd_browsesync.c

@@ -120 +120 @@
         p++;
 
-        unstrcpy(myname, global_myname());
-        strupper_m(myname);
+        unstrcpy(myname, lp_netbios_name());
+        if (!strupper_m(myname)) {
+                DEBUG(2,("strupper_m %s failed\n", myname));
+                return;
+        }
         myname[15]='\0';
         /* The call below does CH_UNIX -> CH_DOS conversion. JRA */
@@ -138 +141 @@
         pull_ascii_nstring(dmb_name, sizeof(dmb_name), work->dmb_name.name);
         send_mailslot(True, BROWSE_MAILSLOT, outbuf,PTR_DIFF(p,outbuf),
-                global_myname(), 0x0, dmb_name, 0x0,
+                lp_netbios_name(), 0x0, dmb_name, 0x0,
                 work->dmb_addr, FIRST_SUBNET->myip, DGRAM_PORT);
 }
@@ -192 +195 @@
      the first SERVER<0x20> name. */
 
-        if(answers->rdata != NULL) {
+        if (answers->rdlength > 0) {
                 char *p = answers->rdata;
                 int numnames = CVAL(p, 0);
@@ -200 +203 @@
                 while (numnames--) {
                         unstring qname;
-                        uint16 nb_flags;
+                        uint16_t nb_flags;
                         int name_type;
 
@@ -331 +334 @@
         userdata->free_fn = NULL;
         userdata->userdata_len = strlen(work->work_group)+1;
-        overmalloc_safe_strcpy(userdata->data, work->work_group, size - sizeof(*userdata) - 1);
+        strlcpy(userdata->data, work->work_group, size - sizeof(*userdata));
 
         node_status( subrec, &nmbname, answer_ip, 
@@ -400 +403 @@
                                               struct in_addr from_ip)
 {
-        struct work_record *work;
         unstring server_name;
 
@@ -415 +417 @@
          */
 
-        if(answers->rdata != NULL) {
+        if (answers->rdlength > 0) {
                 char *p = answers->rdata;
                 int numnames = CVAL(p, 0);
@@ -423 +425 @@
                 while (numnames--) {
                         unstring qname;
-                        uint16 nb_flags;
+                        uint16_t nb_flags;
                         int name_type;
 
@@ -436 +438 @@
                                         server_name[0] == 0) {
                                 /* this is almost certainly the server netbios name */
-                                unstrcpy(server_name, qname);
+                                strlcpy(server_name, qname, sizeof(server_name));
                                 continue;
                         }
 
                         if(!(nb_flags & NB_GROUP) && (name_type == 0x1b)) {
+                                struct work_record *work;
+
                                 if( DEBUGLVL( 5 ) ) {
                                         dbgtext( "get_domain_master_name_node_status_success:\n" );
@@ -453 +457 @@
                                  */
 
-                                if((work = find_workgroup_on_subnet( subrec, qname)) == NULL) {
+                                work = find_workgroup_on_subnet( subrec, qname);
+                                if (work == NULL) {
                                         struct nmb_name nmbname;
                                         /* 
                                          * Add it - with an hour in the cache.
                                          */
-                                        if(!(work= create_workgroup_on_subnet(subrec, qname, 60*60)))
+                                        work = create_workgroup_on_subnet(subrec, qname, 60*60);
+                                        if (work == NULL) {
                                                 return;
+                                        }
 
                                         /* remember who the master is */
-                                        unstrcpy(work->local_master_browser_name, server_name);
+                                        strlcpy(work->local_master_browser_name,
+                                                server_name,
+                                                sizeof(work->local_master_browser_name));
                                         make_nmb_name(&nmbname, server_name, 0x20);
                                         work->dmb_name = nmbname;
@@ -470 +479 @@
                         }
                 }
-        } else if( DEBUGLVL( 0 ) ) {
+        } else if( DEBUGLVL( 1 ) ) {
                 dbgtext( "get_domain_master_name_node_status_success:\n" );
                 dbgtext( "Failed to find a WORKGROUP<0x1b> name in reply from IP " );
@@ -484 +493 @@
                        struct response_record *rrec)
 {
-        if( DEBUGLVL( 0 ) ) {
+        if( DEBUGLVL( 2 ) ) {
                 dbgtext( "get_domain_master_name_node_status_fail:\n" );
                 dbgtext( "Doing a node status request to the domain master browser " );

vendor/current/source3/nmbd/nmbd_elections.c

@@ -23 +23 @@
 #include "includes.h"
 #include "nmbd/nmbd.h"
-#include "smbprofile.h"
 
 /* Election parameters. */
@@ -33 +32 @@
 
 static void send_election_dgram(struct subnet_record *subrec, const char *workgroup_name,
-                                uint32 criterion, int timeup,const char *server_name)
+                                uint32_t criterion, int timeup,const char *server_name)
 {
         char outbuf[1024];
@@ -52 +51 @@
         p += 13;
         unstrcpy(srv_name, server_name);
-        strupper_m(srv_name);
+        if (!strupper_m(srv_name)) {
+                DEBUG(2,("strupper_m failed for %s\n", srv_name));
+                return;
+        }
         /* The following call does UNIX -> DOS charset conversion. */
         push_ascii(p, srv_name, sizeof(outbuf)-PTR_DIFF(p,outbuf)-1, STR_TERMINATE);
@@ -58 +60 @@
 
         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);
@@ -165 +167 @@
         struct subnet_record *subrec;
   
-        START_PROFILE(run_elections);
-
         /* Send election packets once every 2 seconds - note */
         if (lastime && (t - lastime < 2)) {
-                END_PROFILE(run_elections);
                 return;
         }
@@ -195 +194 @@
 
                                 send_election_dgram(subrec, work->work_group, work->ElectionCriterion,
-                                                t - StartupTime, global_myname());
+                                                t - StartupTime, lp_netbios_name());
               
                                 if (work->ElectionCount++ >= 4) {
@@ -209 +208 @@
                 }
         }
-        END_PROFILE(run_elections);
 }
 
@@ -217 +215 @@
 
 static bool win_election(struct work_record *work, int version,
-                         uint32 criterion, int timeup, const char *server_name)
+                         uint32_t criterion, int timeup, const char *server_name)
 {  
         int mytimeup = time(NULL) - StartupTime;
-        uint32 mycriterion = work->ElectionCriterion;
+        uint32_t mycriterion = work->ElectionCriterion;
 
         /* If local master is false then never win in election broadcasts. */
@@ -232 +230 @@
                         criterion, mycriterion,
                         timeup, mytimeup,
-                        server_name, global_myname()));
+                        server_name, lp_netbios_name()));
 
         if (version > ELECTION_VERSION)
@@ -249 +247 @@
                 return(True);
 
-        if (StrCaseCmp(global_myname(), server_name) > 0)
+        if (strcasecmp_m(lp_netbios_name(), server_name) > 0)
                 return(False);
   
@@ -263 +261 @@
         struct dgram_packet *dgram = &p->packet.dgram;
         int version = CVAL(buf,0);
-        uint32 criterion = IVAL(buf,1);
+        uint32_t criterion = IVAL(buf,1);
         int timeup = IVAL(buf,5)/1000;
         unstring server_name;
         struct work_record *work;
         unstring workgroup_name;
-
-        START_PROFILE(election);
 
         pull_ascii_nstring(server_name, sizeof(server_name), buf+13);
@@ -317 +313 @@
         }
 done:
-
-        END_PROFILE(election);
+        return;
 }
 

vendor/current/source3/nmbd/nmbd_incomingdgrams.c

@@ -24 +24 @@
 #include "../librpc/gen_ndr/svcctl.h"
 #include "nmbd/nmbd.h"
-#include "smbprofile.h"
 
 extern bool found_lm_clients;
@@ -101 +100 @@
         int ttl = IVAL(buf,1)/1000;
         unstring announce_name;
-        uint32 servertype = IVAL(buf,23);
+        uint32_t servertype = IVAL(buf,23);
         fstring comment;
         struct work_record *work;
@@ -107 +106 @@
         unstring work_name;
         unstring source_name;
-
-        START_PROFILE(host_announce);
+        ZERO_STRUCT(source_name);
+        ZERO_STRUCT(announce_name);
 
         pull_ascii_fstring(comment, buf+31);
@@ -145 +144 @@
          */
 
-        if(strequal(work_name, global_myname()))
+        if(strequal(work_name, lp_netbios_name()))
                 unstrcpy(work_name,lp_workgroup());
 
@@ -173 +172 @@
                         servrec->serv.type = servertype|SV_TYPE_LOCAL_LIST_ONLY;
                         update_server_ttl( servrec, ttl);
-                        fstrcpy(servrec->serv.comment,comment);
+                        strlcpy(servrec->serv.comment,comment,sizeof(servrec->serv.comment));
                 }
         } else {
@@ -188 +187 @@
         subrec->work_changed = True;
 done:
-
-        END_PROFILE(host_announce);
+        return;
 }
 
@@ -202 +200 @@
         unstring workgroup_announce_name;
         unstring master_name;
-        uint32 servertype = IVAL(buf,23);
+        uint32_t servertype = IVAL(buf,23);
         struct work_record *work;
         unstring source_name;
         unstring dest_name;
-
-        START_PROFILE(workgroup_announce);
 
         pull_ascii_nstring(workgroup_announce_name,sizeof(workgroup_announce_name),buf+5);
@@ -245 +241 @@
 
 done:
-
-        END_PROFILE(workgroup_announce);
+        return;
 }
 
@@ -258 +253 @@
         int ttl = IVAL(buf,1)/1000;
         unstring server_name;
-        uint32 servertype = IVAL(buf,23);
+        uint32_t servertype = IVAL(buf,23);
         fstring comment;
         unstring work_name;
@@ -264 +259 @@
         struct server_record *servrec;
         unstring source_name;
-
-        START_PROFILE(local_master_announce);
 
         pull_ascii_nstring(server_name,sizeof(server_name),buf+5);
@@ -337 +330 @@
                 } else {
                         /* Update the record. */
-                        servrec->serv.type = servertype|SV_TYPE_LOCAL_LIST_ONLY;
+                        if (servrec->serv.type !=
+                                        (servertype|SV_TYPE_LOCAL_LIST_ONLY)) {
+                                servrec->serv.type =
+                                        servertype|SV_TYPE_LOCAL_LIST_ONLY;
+                                subrec->work_changed = true;
+                        }
+                        if (!strequal(servrec->serv.comment,comment)) {
+                                strlcpy(servrec->serv.comment,
+                                        comment,
+                                        sizeof(servrec->serv.comment));
+                                subrec->work_changed = true;
+                        }
                         update_server_ttl(servrec, ttl);
-                        fstrcpy(servrec->serv.comment,comment);
-                }
-        
-                set_workgroup_local_master_browser_name( work, server_name );
+                }
+
+                if (!strequal(work->local_master_browser_name, server_name)) {
+                        set_workgroup_local_master_browser_name( work, server_name );
+                        subrec->work_changed = true;
+                }
         } else {
                 /*
@@ -354 +360 @@
         }
 
-        subrec->work_changed = True;
 done:
-
-        END_PROFILE(local_master_announce);
+        return;
 }
 
@@ -373 +377 @@
         struct work_record *work;
         struct browse_cache_record *browrec;
-
-        START_PROFILE(master_browser_announce);
 
         pull_ascii_nstring(local_master_name,sizeof(local_master_name),buf);
@@ -411 +413 @@
 
 done:
-
-        END_PROFILE(master_browser_announce);
+        return;
 }
 
@@ -422 +423 @@
 {
         struct dgram_packet *dgram = &p->packet.dgram;
-        uint32 servertype = IVAL(buf,1);
+        uint32_t servertype = IVAL(buf,1);
         int osmajor=CVAL(buf,5);           /* major version of node software */
         int osminor=CVAL(buf,6);           /* minor version of node software */
@@ -434 +435 @@
         char *s = get_safe_str_ptr(buf,len,discard_const_p(char, buf),9);
 
-        START_PROFILE(lm_host_announce);
         if (!s) {
                 goto done;
@@ -485 +485 @@
          */
 
-        if(strequal(work_name, global_myname()))
+        if(strequal(work_name, lp_netbios_name()))
                 unstrcpy(work_name,lp_workgroup());
 
@@ -513 +513 @@
                         servrec->serv.type = servertype|SV_TYPE_LOCAL_LIST_ONLY;
                         update_server_ttl( servrec, ttl);
-                        fstrcpy(servrec->serv.comment,comment);
+                        strlcpy(servrec->serv.comment,comment,sizeof(servrec->serv.comment));
                 }
         } else {
@@ -530 +530 @@
 
 done:
-
-        END_PROFILE(lm_host_announce);
+        return;
 }
 
@@ -542 +541 @@
                                       struct nmb_name *send_to_name,
                                       unsigned char max_number_requested,
-                                      uint32 token, struct in_addr sendto_ip,
+                                      uint32_t token, struct in_addr sendto_ip,
                                       int port)
 {
@@ -572 +571 @@
         /* We always return at least one name - our own. */
         count = 1;
-        unstrcpy(myname, global_myname());
-        strupper_m(myname);
+        unstrcpy(myname, lp_netbios_name());
+        if (!strupper_m(myname)) {
+                DEBUG(4,("strupper_m %s failed\n", myname));
+                return;
+        }
         myname[15]='\0';
         push_ascii(p, myname, sizeof(outbuf)-PTR_DIFF(p,outbuf)-1, STR_TERMINATE);
@@ -600 +602 @@
       break;
 
-    if(strnequal(servrec->serv.name, global_myname(),15))
+    if(strnequal(servrec->serv.name, lp_netbios_name(),15))
       continue;
 
@@ -626 +628 @@
         send_mailslot(True, BROWSE_MAILSLOT,
                 outbuf,PTR_DIFF(p,outbuf),
-                global_myname(), 0, 
+                lp_netbios_name(), 0,
                 send_to_namestr,0,
                 sendto_ip, subrec->myip, port);
@@ -647 +649 @@
         struct work_record *work;
         unsigned char max_number_requested = CVAL(buf,0);
-        uint32 token = IVAL(buf,1); /* Sender's key index for the workgroup. */
+        uint32_t token = IVAL(buf,1); /* Sender's key index for the workgroup. */
         int name_type = dgram->dest_name.name_type;
         unstring workgroup_name;
         struct subnet_record *search_subrec = subrec;
 
-        START_PROFILE(get_backup_list);
         pull_ascii_nstring(workgroup_name, sizeof(workgroup_name), dgram->dest_name.name);
 
@@ -710 +711 @@
 
 done:
-
-        END_PROFILE(get_backup_list);
+        return;
 }
 
@@ -730 +730 @@
         int state = CVAL(buf,0);
         struct subnet_record *sr;
-
-        START_PROFILE(reset_browser);
 
         DEBUG(1,("process_reset_browser: received diagnostic browser reset \
@@ -765 +763 @@
         if (state & 0x4)
                 DEBUG(1,("process_reset_browser: ignoring request to stop being a browser.\n"));
-
-        END_PROFILE(reset_browser);
 }
 
@@ -783 +779 @@
         unstring workgroup_name;
  
-        START_PROFILE(announce_request);
-
         pull_ascii_nstring(workgroup_name, sizeof(workgroup_name), dgram->dest_name.name);
         DEBUG(3,("process_announce_request: Announce request from %s IP %s to %s.\n",
@@ -805 +799 @@
         work->needannounce = True;
 done:
-
-        END_PROFILE(announce_request);
+        return;
 }
 
@@ -823 +816 @@
         unstring workgroup_name;
 
-        START_PROFILE(lm_announce_request);
-
         pull_ascii_nstring(workgroup_name, sizeof(workgroup_name), dgram->dest_name.name);
         DEBUG(3,("process_lm_announce_request: Announce request from %s IP %s to %s.\n",
@@ -846 +837 @@
 
 done:
-
-        END_PROFILE(lm_announce_request);
-}
+        return;
+}

vendor/current/source3/nmbd/nmbd_incomingrequests.c

@@ -61 +61 @@
         unstring qname;
         bool bcast = nmb->header.nm_flags.bcast;
-        uint16 nb_flags = get_nb_flags(nmb->additional->rdata);
+        uint16_t nb_flags = get_nb_flags(nmb->additional->rdata);
         bool group = (nb_flags & NB_GROUP) ? True : False;
         struct name_record *namerec;
@@ -193 +193 @@
         struct nmb_name *question = &nmb->question.question_name;
         bool bcast = nmb->header.nm_flags.bcast;
-        uint16 nb_flags = get_nb_flags(nmb->additional->rdata);
+        uint16_t nb_flags = get_nb_flags(nmb->additional->rdata);
         bool group = (nb_flags & NB_GROUP) ? True : False;
         struct name_record *namerec = NULL;
@@ -291 +291 @@
         for (l2=0;l2<15 && n2[l2] && n2[l2] != ' ';l2++)
                 ;
-        l3 = strlen(global_myname());
-
-        if ((l1==l3) && strncmp(n1,global_myname(),l3) == 0 && 
-                        (l2!=l3 || strncmp(n2,global_myname(),l3) != 0))
+        l3 = strlen(lp_netbios_name());
+
+        if ((l1==l3) && strncmp(n1,lp_netbios_name(),l3) == 0 &&
+                        (l2!=l3 || strncmp(n2,lp_netbios_name(),l3) != 0))
                 return -1;
 
-        if ((l2==l3) && strncmp(n2,global_myname(),l3) == 0 && 
-                        (l1!=l3 || strncmp(n1,global_myname(),l3) != 0))
+        if ((l2==l3) && strncmp(n2,lp_netbios_name(),l3) == 0 &&
+                        (l1!=l3 || strncmp(n1,lp_netbios_name(),l3) != 0))
                 return 1;
 
@@ -348 +348 @@
 
                         pull_ascii_nstring(name, sizeof(name), namerec->name.name);
-                        strupper_m(name);
+                        if (!strupper_m(name)) {
+                                DEBUG(2,("strupper_m %s failed\n", name));
+                                return;
+                        }
                         if (!strequal(name,"*") &&
                                         !strequal(name,"__SAMBA__") &&

vendor/current/source3/nmbd/nmbd_lmhosts.c

@@ -71 +71 @@
                 if(name_type == -1) {
                         /* Add the (0) and (0x20) names directly into the namelist for this subnet. */
-                        (void)add_name_to_subnet(subrec,name,0x00,(uint16)NB_ACTIVE,PERMANENT_TTL,source,1,&ipaddr);
-                        (void)add_name_to_subnet(subrec,name,0x20,(uint16)NB_ACTIVE,PERMANENT_TTL,source,1,&ipaddr);
+                        (void)add_name_to_subnet(subrec,name,0x00,(uint16_t)NB_ACTIVE,PERMANENT_TTL,source,1,&ipaddr);
+                        (void)add_name_to_subnet(subrec,name,0x20,(uint16_t)NB_ACTIVE,PERMANENT_TTL,source,1,&ipaddr);
                 } else {
                         /* Add the given name type to the subnet namelist. */
-                        (void)add_name_to_subnet(subrec,name,name_type,(uint16)NB_ACTIVE,PERMANENT_TTL,source,1,&ipaddr);
+                        (void)add_name_to_subnet(subrec,name,name_type,(uint16_t)NB_ACTIVE,PERMANENT_TTL,source,1,&ipaddr);
                 }
         }

vendor/current/source3/nmbd/nmbd_logonnames.c

@@ -25 +25 @@
 #include "nmbd/nmbd.h"
 
-extern uint16 samba_nb_type; /* Samba's NetBIOS type. */
+extern uint16_t samba_nb_type; /* Samba's NetBIOS type. */
 
 /****************************************************************************
@@ -47 +47 @@
         }
 
-        if((servrec = find_server_in_workgroup( work, global_myname())) == NULL) {
+        if((servrec = find_server_in_workgroup( work, lp_netbios_name())) == NULL) {
                 DEBUG(0,("become_logon_server_fail: Error - cannot find server %s \
 in workgroup %s on subnet %s\n",
-                        global_myname(), failname, subrec->subnet_name));
+                        lp_netbios_name(), failname, subrec->subnet_name));
                 work->log_state = LOGON_NONE;
                 return;
@@ -73 +73 @@
                                         struct userdata_struct *userdata,
                                         struct nmb_name *registered_name,
-                                        uint16 nb_flags,
+                                        uint16_t nb_flags,
                                         int ttl, struct in_addr registered_ip)
 {
@@ -88 +88 @@
         }
 
-        if((servrec = find_server_in_workgroup( work, global_myname())) == NULL) {
+        if((servrec = find_server_in_workgroup( work, lp_netbios_name())) == NULL) {
                 DEBUG(0,("become_logon_server_success: Error - cannot find server %s \
 in workgroup %s on subnet %s\n",
-                        global_myname(), reg_name, subrec->subnet_name));
+                        lp_netbios_name(), reg_name, subrec->subnet_name));
                 work->log_state = LOGON_NONE;
                 return;

vendor/current/source3/nmbd/nmbd_mynames.c

@@ -24 +24 @@
 #include "nmbd/nmbd.h"
 
-extern uint16 samba_nb_type; /* Samba's NetBIOS type. */
+extern uint16_t samba_nb_type; /* Samba's NetBIOS type. */
 
 /****************************************************************************
@@ -84 +84 @@
 
 static void insert_refresh_name_into_unicast( struct subnet_record *subrec,
-                                                struct nmb_name *nmbname, uint16 nb_type )
+                                                struct nmb_name *nmbname, uint16_t nb_type )
 {
         struct name_record *namerec;

vendor/current/source3/nmbd/nmbd_namelistdb.c

@@ -25 +25 @@
 #include "nmbd/nmbd.h"
 
-uint16 samba_nb_type = 0; /* samba's NetBIOS name type */
+uint16_t samba_nb_type = 0; /* samba's NetBIOS name type */
 
 
@@ -34 +34 @@
 void set_samba_nb_type(void)
 {
-        if( lp_wins_support() || wins_srv_count() ) {
+        if( lp_we_are_a_wins_server() || wins_srv_count() ) {
                 samba_nb_type = NB_HFLAG;               /* samba is a 'hybrid' node type. */
         } else {
@@ -45 +45 @@
 ***************************************************************************/
 
-static void upcase_name( struct nmb_name *target, const struct nmb_name *source )
+static bool upcase_name( struct nmb_name *target, const struct nmb_name *source )
 {
         int i;
@@ -56 +56 @@
 
         pull_ascii_nstring(targ, sizeof(targ), target->name);
-        strupper_m( targ );
+        if (!strupper_m( targ )) {
+                return false;
+        }
         push_ascii_nstring( target->name, targ);
 
         pull_ascii(scope, target->scope, 64, -1, STR_TERMINATE);
-        strupper_m( scope );
+        if (!strupper_m( scope )) {
+                return false;
+        }
         push_ascii(target->scope, scope, 64, STR_TERMINATE);
 
@@ -73 +77 @@
                 target->scope[i] = '\0';
         }
+        return true;
 }
 
@@ -105 +110 @@
         struct name_record *name_ret;
 
-        upcase_name( &uc_name, nmbname );
+        if (!upcase_name( &uc_name, nmbname )) {
+                return NULL;
+        }
         
         if (subrec == wins_server_subnet) {
@@ -185 +192 @@
                         const char *name,
                         int type,
-                        uint16 nb_flags,
+                        uint16_t nb_flags,
                         int ttl,
                         enum name_source source,
@@ -217 +224 @@
 
         make_nmb_name(&namerec->name, name, type);
-        upcase_name(&namerec->name, NULL );
+        if (!upcase_name(&namerec->name, NULL )) {
+                SAFE_FREE(namerec->data.ip);
+                SAFE_FREE(namerec);
+                return False;
+        }
 
         /* Enter the name as active. */
@@ -276 +287 @@
 void standard_success_register(struct subnet_record *subrec, 
                              struct userdata_struct *userdata,
-                             struct nmb_name *nmbname, uint16 nb_flags, int ttl,
+                             struct nmb_name *nmbname, uint16_t nb_flags, int ttl,
                              struct in_addr registered_ip)
 {
@@ -632 +643 @@
 void dump_all_namelists(void)
 {
-        XFILE *fp; 
+        XFILE *fp;
         struct subnet_record *subrec;
-
-        fp = x_fopen(lock_path("namelist.debug"),O_WRONLY|O_CREAT|O_TRUNC, 0644);
-     
-        if (!fp) { 
+        char *dump_path;
+
+        dump_path = lock_path("namelist.debug");
+        if (dump_path == NULL) {
+                DEBUG(0, ("out of memory!\n"));
+                return;
+        }
+
+        fp = x_fopen(dump_path, (O_WRONLY | O_CREAT | O_TRUNC), 0644);
+        TALLOC_FREE(dump_path);
+        if (!fp) {
                 DEBUG(0,("dump_all_namelists: Can't open file %s. Error was %s\n",
                         "namelist.debug",strerror(errno)));
                 return;
         }
-      
+
         for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_INCLUDING_UNICAST(subrec)) {
                 dump_subnet_namelist( subrec, fp );

vendor/current/source3/nmbd/nmbd_nameregister.c

@@ -48 +48 @@
         struct nmb_packet *sent_nmb = &rrec->packet->packet.nmb;
         int ttl = 0;
-        uint16 nb_flags = 0;
+        uint16_t nb_flags = 0;
         struct in_addr register_ip;
         fstring reg_name;
@@ -211 +211 @@
            copes with all the wins servers being down */
         if (wins_srv_is_dead(rrec->packet->ip, register_ip)) {
-                uint16 nb_flags = get_nb_flags(sent_nmb->additional->rdata);
+                uint16_t nb_flags = get_nb_flags(sent_nmb->additional->rdata);
                 int ttl = sent_nmb->additional->ttl;
 
@@ -262 +262 @@
         bool success = False;
         struct nmb_name *question_name = &sent_nmb->question.question_name;
-        uint16 nb_flags = 0;
+        uint16_t nb_flags = 0;
         int ttl = 0;
         struct in_addr registered_ip;
@@ -307 +307 @@
 
 static void multihomed_register_one(struct nmb_name *nmbname,
-                                    uint16 nb_flags,
+                                    uint16_t nb_flags,
                                     register_name_success_function success_fn,
                                     register_name_fail_function fail_fn,
@@ -357 +357 @@
         struct nmb_packet *sent_nmb = &rrec->packet->packet.nmb;
         struct nmb_name *nmbname = &sent_nmb->question.question_name;
-        uint16 nb_flags = get_nb_flags(sent_nmb->additional->rdata);
+        uint16_t nb_flags = get_nb_flags(sent_nmb->additional->rdata);
         struct userdata_struct *userdata = rrec->userdata;
         const char *tag;
@@ -401 +401 @@
 ****************************************************************************/
 
-static void multihomed_register_name(struct nmb_name *nmbname, uint16 nb_flags,
+static void multihomed_register_name(struct nmb_name *nmbname, uint16_t nb_flags,
                                      register_name_success_function success_fn,
                                      register_name_fail_function fail_fn)
@@ -476 +476 @@
 
 void register_name(struct subnet_record *subrec,
-                   const char *name, int type, uint16 nb_flags,
+                   const char *name, int type, uint16_t nb_flags,
                    register_name_success_function success_fn,
                    register_name_fail_function fail_fn,
@@ -483 +483 @@
         struct nmb_name nmbname;
         nstring nname;
+        size_t converted_size;
 
         errno = 0;
-        push_ascii_nstring(nname, name);
-        if (errno == E2BIG) {
-                unstring tname;
-                pull_ascii_nstring(tname, sizeof(tname), nname);
-                DEBUG(0,("register_name: NetBIOS name %s is too long. Truncating to %s\n",
-                        name, tname));
-                make_nmb_name(&nmbname, tname, type);
+        converted_size = push_ascii_nstring(nname, name);
+        if (converted_size != (size_t)-1) {
+                /* Success. */
+                make_nmb_name(&nmbname, name, type);
+        } else if (errno == E2BIG) {
+                /*
+                 * Name converted to CH_DOS is too large.
+                 * try to truncate.
+                 */
+                char *converted_str_dos = NULL;
+                char *converted_str_unix = NULL;
+                bool ok;
+
+                converted_size = 0;
+
+                ok = convert_string_talloc(talloc_tos(),
+                                CH_UNIX,
+                                CH_DOS,
+                                name,
+                                strlen(name)+1,
+                                &converted_str_dos,
+                                &converted_size);
+                if (!ok) {
+                        DEBUG(0,("register_name: NetBIOS name %s cannot be "
+                                "converted. Failing to register name.\n",
+                                name));
+                        return;
+                }
+
+                /*
+                 * As it's now CH_DOS codepage
+                 * we truncate by writing '\0' at
+                 * MAX_NETBIOSNAME_LEN-1 and then
+                 * convert back to CH_UNIX which we
+                 * need for the make_nmb_name() call.
+                 */
+                if (converted_size >= MAX_NETBIOSNAME_LEN) {
+                        converted_str_dos[MAX_NETBIOSNAME_LEN-1] = '\0';
+                }
+
+                ok = convert_string_talloc(talloc_tos(),
+                                CH_DOS,
+                                CH_UNIX,
+                                converted_str_dos,
+                                strlen(converted_str_dos)+1,
+                                &converted_str_unix,
+                                &converted_size);
+                if (!ok) {
+                        DEBUG(0,("register_name: NetBIOS name %s cannot be "
+                                "converted back to CH_UNIX. "
+                                "Failing to register name.\n",
+                                converted_str_dos));
+                        TALLOC_FREE(converted_str_dos);
+                        return;
+                }
+
+                make_nmb_name(&nmbname, converted_str_unix, type);
+
+                TALLOC_FREE(converted_str_dos);
+                TALLOC_FREE(converted_str_unix);
         } else {
-                make_nmb_name(&nmbname, name, type);
+                /*
+                 * Generic conversion error. Fail to register.
+                 */
+                DEBUG(0,("register_name: NetBIOS name %s cannot be "
+                        "converted (%s). Failing to register name.\n",
+                        name, strerror(errno)));
+                return;
         }
 

vendor/current/source3/nmbd/nmbd_packets.c

@@ -95 +95 @@
 **************************************************************************/
 
-uint16 get_nb_flags(char *buf)
-{
-        return ((((uint16)*buf)&0xFFFF) & NB_FLGMSK);
-}
-
-void set_nb_flags(char *buf, uint16 nb_flags)
+uint16_t get_nb_flags(char *buf)
+{
+        return ((((uint16_t)*buf)&0xFFFF) & NB_FLGMSK);
+}
+
+void set_nb_flags(char *buf, uint16_t nb_flags)
 {
         *buf++ = ((nb_flags & NB_FLGMSK) & 0xFF);
@@ -146 +146 @@
 **************************************************************************/
 
-static uint16 name_trn_id=0;
-
-static uint16 generate_name_trn_id(void)
+static uint16_t name_trn_id=0;
+
+static uint16_t generate_name_trn_id(void)
 {
         if (!name_trn_id) {
-                name_trn_id = ((unsigned)time(NULL)%(unsigned)0x7FFF) + ((unsigned)sys_getpid()%(unsigned)100);
+                name_trn_id = ((unsigned)time(NULL)%(unsigned)0x7FFF) + ((unsigned)getpid()%(unsigned)100);
         }
         name_trn_id = (name_trn_id+1) % (unsigned)0x7FFF;
@@ -243 +243 @@
 
 static bool create_and_init_additional_record(struct packet_struct *packet,
-                                                     uint16 nb_flags,
+                                                     uint16_t nb_flags,
                                                      const struct in_addr *register_ip)
 {
@@ -336 +336 @@
 
 static bool initiate_name_register_packet( struct packet_struct *packet,
-                                    uint16 nb_flags, const struct in_addr *register_ip)
+                                    uint16_t nb_flags, const struct in_addr *register_ip)
 {
         struct nmb_packet *nmb = &packet->packet.nmb;
@@ -360 +360 @@
 
 static bool initiate_multihomed_name_register_packet(struct packet_struct *packet,
-                                                     uint16 nb_flags, struct in_addr *register_ip)
+                                                     uint16_t nb_flags, struct in_addr *register_ip)
 {
         struct nmb_packet *nmb = &packet->packet.nmb;
@@ -388 +388 @@
 
 static bool initiate_name_refresh_packet( struct packet_struct *packet,
-                                   uint16 nb_flags, struct in_addr *refresh_ip)
+                                   uint16_t nb_flags, struct in_addr *refresh_ip)
 {
         struct nmb_packet *nmb = &packet->packet.nmb;
@@ -412 +412 @@
 
 static bool initiate_name_release_packet( struct packet_struct *packet,
-                                   uint16 nb_flags, struct in_addr *release_ip)
+                                   uint16_t nb_flags, struct in_addr *release_ip)
 {
         struct nmb_packet *nmb = &packet->packet.nmb;
@@ -485 +485 @@
                           struct userdata_struct *userdata,
                           struct nmb_name *nmbname,
-                          uint16 nb_flags)
+                          uint16_t nb_flags)
 {
         struct packet_struct *p;
@@ -536 +536 @@
                         response_function resp_fn,
                         timeout_response_function timeout_fn,
-                        uint16 nb_flags,
+                        uint16_t nb_flags,
                         struct in_addr refresh_ip,
                         const char *tag)
@@ -603 +603 @@
                                                         struct userdata_struct *userdata,
                                                         struct nmb_name *nmbname,
-                                                        uint16 nb_flags,
+                                                        uint16_t nb_flags,
                                                         struct in_addr register_ip,
                                                         struct in_addr wins_ip)
@@ -661 +661 @@
                                             struct userdata_struct *userdata,
                                             struct nmb_name *nmbname,
-                                            uint16 nb_flags,
+                                            uint16_t nb_flags,
                                             struct in_addr release_ip,
                                             struct in_addr dest_ip)
@@ -964 +964 @@
         }
 
-        DEBUG(4,("reply_netbios_packet: sending a reply of packet type: %s %s to ip %s \
-for id %hu\n", packet_type, nmb_namestr(&orig_nmb->question.question_name),
-                        inet_ntoa(packet.ip), orig_nmb->header.name_trn_id));
+        DEBUG(4, ("reply_netbios_packet: sending a reply of packet type: %s "
+                  "%s to ip %s for id %d\n", packet_type,
+                  nmb_namestr(&orig_nmb->question.question_name),
+                  inet_ntoa(packet.ip), orig_nmb->header.name_trn_id));
 
         nmb->header.name_trn_id = orig_nmb->header.name_trn_id;
@@ -1033 +1034 @@
 void queue_packet(struct packet_struct *packet)
 {
-        DLIST_ADD_END(packet_queue, packet, struct packet_struct *);
+        DLIST_ADD_END(packet_queue, packet);
 }
 
@@ -1074 +1075 @@
         /* Drop the packet if it's a different NetBIOS scope, or the source is from one of our names. */
         pull_ascii(scope, dgram->dest_name.scope, 64, 64, STR_TERMINATE);
-        if (!strequal(scope, global_scope())) {
+        if (!strequal(scope, lp_netbios_scope())) {
                 DEBUG(7,("process_browse_packet: Discarding datagram from IP %s. Scope (%s) \
-mismatch with our scope (%s).\n", inet_ntoa(p->ip), scope, global_scope()));
+mismatch with our scope (%s).\n", inet_ntoa(p->ip), scope, lp_netbios_scope()));
                 return;
         }
@@ -1162 +1163 @@
 
         pull_ascii(scope, dgram->dest_name.scope, 64, 64, STR_TERMINATE);
-        if (!strequal(scope, global_scope())) {
+        if (!strequal(scope, lp_netbios_scope())) {
                 DEBUG(7,("process_lanman_packet: Discarding datagram from IP %s. Scope (%s) \
-mismatch with our scope (%s).\n", inet_ntoa(p->ip), scope, global_scope()));
+mismatch with our scope (%s).\n", inet_ntoa(p->ip), scope, lp_netbios_scope()));
                 return;
         }
@@ -1292 +1293 @@
         DEBUG(4,("process_dgram: datagram from %s to %s IP %s for %s of type %d len=%d\n",
                 nmb_namestr(&dgram->source_name),nmb_namestr(&dgram->dest_name),
-                inet_ntoa(p->ip), smb_buf(buf),CVAL(buf2,0),len));
+                inet_ntoa(p->ip), smb_buf_const(buf),CVAL(buf2,0),len));
 
         /* Datagram packet received for the browser mailslot */
-        if (strequal(smb_buf(buf),BROWSE_MAILSLOT)) {
+        if (strequal(smb_buf_const(buf),BROWSE_MAILSLOT)) {
                 process_browse_packet(p,buf2,len);
                 return;
@@ -1301 +1302 @@
 
         /* Datagram packet received for the LAN Manager mailslot */
-        if (strequal(smb_buf(buf),LANMAN_MAILSLOT)) {
+        if (strequal(smb_buf_const(buf),LANMAN_MAILSLOT)) {
                 process_lanman_packet(p,buf2,len);
                 return;
@@ -1307 +1308 @@
 
         /* Datagram packet received for the domain logon mailslot */
-        if (strequal(smb_buf(buf),NET_LOGON_MAILSLOT)) {
+        if (strequal(smb_buf_const(buf),NET_LOGON_MAILSLOT)) {
                 process_logon_packet(p,buf2,len,NET_LOGON_MAILSLOT);
                 return;
@@ -1313 +1314 @@
 
         /* Datagram packet received for the NT domain logon mailslot */
-        if (strequal(smb_buf(buf),NT_LOGON_MAILSLOT)) {
+        if (strequal(smb_buf_const(buf),NT_LOGON_MAILSLOT)) {
                 process_logon_packet(p,buf2,len,NT_LOGON_MAILSLOT);
                 return;
@@ -1436 +1437 @@
                 rrec = find_response_record( &subrec, nmb->header.name_trn_id);
                 if(rrec == NULL) {
-                        DEBUG(3,("find_subnet_for_nmb_packet: response record not found for response id %hu\n",
-                                nmb->header.name_trn_id));
+                        DEBUG(3, ("find_subnet_for_nmb_packet: response "
+                                  "record not found for response id %d\n",
+                                  nmb->header.name_trn_id));
                         nb_packet_dispatch(packet_server, p);
                         return NULL;
@@ -1443 +1445 @@
 
                 if(subrec == NULL) {
-                        DEBUG(0,("find_subnet_for_nmb_packet: subnet record not found for response id %hu\n",
-                                nmb->header.name_trn_id));
+                        DEBUG(0, ("find_subnet_for_nmb_packet: subnet record "
+                                  "not found for response id %d\n",
+                                  nmb->header.name_trn_id));
                         return NULL;
                 }
@@ -1566 +1569 @@
 
         if(rrec == NULL) {
-                DEBUG(0,("process_nmb_response: response packet received but no response record \
-found for id = %hu. Ignoring packet.\n", nmb->header.name_trn_id));
+                DEBUG(0, ("process_nmb_response: response packet received but "
+                          "no response record found for id = %d. Ignoring "
+                          "packet.\n", nmb->header.name_trn_id));
                 return;
         }
@@ -1699 +1703 @@
              subrec != NULL;
              subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
-                count += 2;     /* nmb_sock and dgram_sock */
+                if (subrec->nmb_sock != -1) {
+                        count += 1;
+                }
+                if (subrec->dgram_sock != -1) {
+                        count += 1;
+                }
                 if (subrec->nmb_bcast != -1) {
                         count += 1;
@@ -1708 +1717 @@
         }
 
-        fds = TALLOC_ZERO_ARRAY(NULL, struct pollfd, count);
+        fds = talloc_zero_array(NULL, struct pollfd, count);
         if (fds == NULL) {
                 DEBUG(1, ("create_listen_pollfds: malloc fail for fds. "
@@ -1715 +1724 @@
         }
 
-        attrs = TALLOC_ARRAY(NULL, struct socket_attributes, count);
+        attrs = talloc_array(NULL, struct socket_attributes, count);
         if (fds == NULL) {
                 DEBUG(1, ("create_listen_pollfds: malloc fail for attrs. "
                           "size %d\n", count));
-                SAFE_FREE(fds);
+                TALLOC_FREE(fds);
                 return true;
         }
@@ -1737 +1746 @@
         for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
 
-                fds[num].fd = subrec->nmb_sock;
-                attrs[num].type = NMB_PACKET;
-                attrs[num].broadcast = false;
-                num += 1;
+                if (subrec->nmb_sock != -1) {
+                        fds[num].fd = subrec->nmb_sock;
+                        attrs[num].type = NMB_PACKET;
+                        attrs[num].broadcast = false;
+                        num += 1;
+                }
 
                 if (subrec->nmb_bcast != -1) {
@@ -1749 +1760 @@
                 }
 
-                fds[num].fd = subrec->dgram_sock;
-                attrs[num].type = DGRAM_PACKET;
-                attrs[num].broadcast = false;
-                num += 1;
+                if (subrec->dgram_sock != -1) {
+                        fds[num].fd = subrec->dgram_sock;
+                        attrs[num].type = DGRAM_PACKET;
+                        attrs[num].broadcast = false;
+                        num += 1;
+                }
 
                 if (subrec->dgram_bcast != -1) {
@@ -1856 +1869 @@
 ***************************************************************************/
 
-bool listen_for_packets(bool run_election)
+bool listen_for_packets(struct messaging_context *msg, bool run_election)
 {
         static struct pollfd *fds = NULL;
@@ -1886 +1899 @@
          */
 
-        fds = TALLOC_REALLOC_ARRAY(NULL, fds, struct pollfd, listen_number);
+        fds = talloc_realloc(NULL, fds, struct pollfd, listen_number);
         if (fds == NULL) {
                 return true;
@@ -1895 +1908 @@
         dns_fd = asyncdns_fd();
         if (dns_fd != -1) {
-                fds = TALLOC_REALLOC_ARRAY(NULL, fds, struct pollfd, num_sockets+1);
+                fds = talloc_realloc(NULL, fds, struct pollfd, num_sockets+1);
                 if (fds == NULL) {
                         return true;
@@ -1927 +1940 @@
                                &fds, &num_sockets, &timeout);
 
-        pollrtn = sys_poll(fds, num_sockets, timeout);
+        pollrtn = poll(fds, num_sockets, timeout);
 
         if (run_events_poll(nmbd_event_context(), pollrtn, fds, num_sockets)) {
@@ -1940 +1953 @@
         if ((dns_fd != -1) && (dns_pollidx != -1) &&
             (fds[dns_pollidx].revents & (POLLIN|POLLHUP|POLLERR))) {
-                run_dns_queue();
+                run_dns_queue(msg);
         }
 #endif
@@ -1987 +2000 @@
                 }
 
-                if ((is_loopback_ip_v4(packet->ip) || ismyip_v4(packet->ip)) &&
-                    packet->port == client_port)
-                {
-                        if (client_port == DGRAM_PORT) {
-                                DEBUG(7,("discarding own dgram packet from %s:%d\n",
-                                        inet_ntoa(packet->ip),packet->port));
-                                free_packet(packet);
-                                continue;
-                        }
-
-                        if (packet->packet.nmb.header.nm_flags.bcast) {
-                                DEBUG(7,("discarding own nmb bcast packet from %s:%d\n",
-                                        inet_ntoa(packet->ip),packet->port));
-                                free_packet(packet);
-                                continue;
+                if (!IS_DC) {
+                        if ((is_loopback_ip_v4(packet->ip) || ismyip_v4(packet->ip)) &&
+                        packet->port == client_port)
+                        {
+                                if (client_port == DGRAM_PORT) {
+                                        DEBUG(7,("discarding own dgram packet from %s:%d\n",
+                                                inet_ntoa(packet->ip),packet->port));
+                                        free_packet(packet);
+                                        continue;
+                                }
+
+                                if (packet->packet.nmb.header.nm_flags.bcast) {
+                                        DEBUG(7,("discarding own nmb bcast packet from %s:%d\n",
+                                                inet_ntoa(packet->ip),packet->port));
+                                        free_packet(packet);
+                                        continue;
+                                }
                         }
                 }
@@ -2089 +2104 @@
         SSVAL(ptr,smb_vwv16,2);
         p2 = smb_buf(ptr);
-        safe_strcpy_base(p2, mailslot, dgram->data, sizeof(dgram->data));
+        strlcpy_base(p2, mailslot, dgram->data, sizeof(dgram->data));
         p2 = skip_string(ptr,MAX_DGRAM_SIZE,p2);
 

vendor/current/source3/nmbd/nmbd_processlogon.c

@@ -33 +33 @@
 
 struct sam_database_info {
-        uint32 index;
-        uint32 serial_lo, serial_hi;
-        uint32 date_lo, date_hi;
+        uint32_t index;
+        uint32_t serial_lo, serial_hi;
+        uint32_t date_lo, date_hi;
 };
 
@@ -57 +57 @@
 }
 
-static void delayed_init_logon_handler(struct event_context *event_ctx,
-                                       struct timed_event *te,
+static void delayed_init_logon_handler(struct tevent_context *event_ctx,
+                                       struct tevent_timer *te,
                                        struct timeval now,
                                        void *private_data)
@@ -121 +121 @@
 
         /* we create a connected udp socket */
-        status = cldap_socket_init(ctx, nmbd_event_context(), NULL,
-                                   server_addr, &ctx->cldap_sock);
+        status = cldap_socket_init(ctx, NULL, server_addr, &ctx->cldap_sock);
         TALLOC_FREE(server_addr);
         if (!NT_STATUS_IS_OK(status)) {
@@ -158 +157 @@
                              struct in_addr local_ip,
                              struct packet_struct *p,
-                             uint8_t *buf,
+                             const uint8_t *buf,
                              uint32_t len)
 {
@@ -174 +173 @@
         struct dgram_packet *dgram = &p->packet.dgram;
 
-        state = TALLOC_ZERO_P(ctx, struct nmbd_proxy_logon_state);
+        state = talloc_zero(ctx, struct nmbd_proxy_logon_state);
         if (!state) {
                 DEBUG(0,("failed to allocate nmbd_proxy_logon_state\n"));
@@ -250 +249 @@
         state->io.in.map_response       = false;
 
-        subreq = cldap_netlogon_send(state,
+        subreq = cldap_netlogon_send(state, nmbd_event_context(),
                                      ctx->cldap_sock,
                                      &state->io);
@@ -292 +291 @@
         send_mailslot(true, state->remote_mailslot,
                       (char *)response.data, response.length,
-                      global_myname(), 0x0,
+                      lp_netbios_name(), 0x0,
                       state->remote_name,
                       state->remote_name_type,
@@ -329 +328 @@
                 return;
         }
-        ip = ((struct sockaddr_in *)pss)->sin_addr;
-
-        if (!lp_domain_logons()) {
+        ip = ((const struct sockaddr_in *)pss)->sin_addr;
+
+        if (!IS_DC) {
                 DEBUG(5,("process_logon_packet: Logon packet received from IP %s and domain \
 logons are not enabled.\n", inet_ntoa(p->ip) ));
@@ -339 +338 @@
         pull_ascii_nstring(source_name, sizeof(source_name), dgram->source_name.name);
 
-        pdc_name = talloc_asprintf(talloc_tos(), "\\\\%s", global_myname());
+        pdc_name = talloc_asprintf(talloc_tos(), "\\\\%s", lp_netbios_name());
         if (!pdc_name) {
                 return;
@@ -392 +391 @@
                                 (char *)blob_out.data,
                                 blob_out.length,
-                                global_myname(), 0x0,
+                                lp_netbios_name(), 0x0,
                                 source_name,
                                 dgram->source_name.name_type,
@@ -412 +411 @@
                         request.req.pdc.computer_name,
                         inet_ntoa(p->ip),
-                        global_myname(),
+                        lp_netbios_name(),
                         lp_workgroup(),
                         NETLOGON_RESPONSE_FROM_PDC,
@@ -420 +419 @@
 
                 get_pdc.command                 = NETLOGON_RESPONSE_FROM_PDC;
-                get_pdc.pdc_name                = global_myname();
+                get_pdc.pdc_name                = lp_netbios_name();
                 get_pdc._pad                    = data_blob_null;
-                get_pdc.unicode_pdc_name        = global_myname();
+                get_pdc.unicode_pdc_name        = lp_netbios_name();
                 get_pdc.domain_name             = lp_workgroup();
                 get_pdc.nt_version              = NETLOGON_NT_VERSION_1;
@@ -444 +443 @@
                         (char *)blob_out.data,
                         blob_out.length,
-                        global_myname(), 0x0,
+                        lp_netbios_name(), 0x0,
                         source_name,
                         dgram->source_name.name_type,
@@ -457 +456 @@
 
                 struct netlogon_samlogon_response samlogon;
+                struct NETLOGON_SAM_LOGON_RESPONSE_NT40 nt4;
 
                 if (global_nmbd_proxy_logon) {
                         nmbd_proxy_logon(global_nmbd_proxy_logon,
-                                         ip, p, (uint8_t *)buf, len);
+                                         ip, p, (const uint8_t *)buf, len);
                         return;
                 }
@@ -484 +484 @@
                 }
 
-                /* we want the simple version unless we are an ADS PDC..which means  */
-                /* never, at least for now */
-
-                if ((request.req.logon.nt_version < (NETLOGON_NT_VERSION_1 | NETLOGON_NT_VERSION_5 | NETLOGON_NT_VERSION_5EX_WITH_IP)) ||
-                    (SEC_ADS != lp_security()) || (ROLE_DOMAIN_PDC != lp_server_role())) {
-
-                        struct NETLOGON_SAM_LOGON_RESPONSE_NT40 nt4;
-
-                        nt4.command             = user_unknown ? LOGON_SAM_LOGON_USER_UNKNOWN :
-                                                                 LOGON_SAM_LOGON_RESPONSE;
-                        nt4.pdc_name            = pdc_name;
-                        nt4.user_name           = request.req.logon.user_name;
-                        nt4.domain_name         = lp_workgroup();
-                        nt4.nt_version          = NETLOGON_NT_VERSION_1;
-                        nt4.lmnt_token          = 0xffff;
-                        nt4.lm20_token          = 0xffff;
-
-                        samlogon.ntver = NETLOGON_NT_VERSION_1;
-                        samlogon.data.nt4 = nt4;
-
-                        if (DEBUGLEVEL >= 10) {
-                                NDR_PRINT_DEBUG(NETLOGON_SAM_LOGON_RESPONSE_NT40, &nt4);
-                        }
-                }
-#ifdef HAVE_ADS
-                else {
-
-                        struct NETLOGON_SAM_LOGON_RESPONSE_EX nt5_ex;
-                        struct GUID domain_guid;
-                        struct nbt_sockaddr saddr;
-                        char *domain;
-                        const char *hostname;
-
-                        saddr.sockaddr_family   = 2; /* AF_INET */
-                        saddr.pdc_ip            = inet_ntoa(ip);
-                        saddr.remaining         = data_blob_talloc_zero(talloc_tos(), 8); /* ??? */
-
-                        domain = get_mydnsdomname(talloc_tos());
-                        if (!domain) {
-                                DEBUG(2,("get_mydnsdomname failed.\n"));
-                                return;
-                        }
-
-                        hostname = get_mydnsfullname();
-                        if (!hostname) {
-                                DEBUG(2,("get_mydnsfullname failed.\n"));
-                                return;
-                        }
-
-                        if (!secrets_fetch_domain_guid(domain, &domain_guid)) {
-                                DEBUG(2,("Could not fetch DomainGUID for %s\n", domain));
-                                return;
-                        }
-
-                        nt5_ex.command          = user_unknown ? LOGON_SAM_LOGON_USER_UNKNOWN_EX :
-                                                                 LOGON_SAM_LOGON_RESPONSE_EX;
-                        nt5_ex.sbz              = 0;
-                        nt5_ex.server_type      = NBT_SERVER_PDC |
-                                                  NBT_SERVER_GC |
-                                                  NBT_SERVER_LDAP |
-                                                  NBT_SERVER_DS |
-                                                  NBT_SERVER_KDC |
-                                                  NBT_SERVER_TIMESERV |
-                                                  NBT_SERVER_CLOSEST |
-                                                  NBT_SERVER_WRITABLE;
-                        nt5_ex.domain_uuid      = domain_guid;
-                        nt5_ex.forest           = domain;
-                        nt5_ex.dns_domain       = domain;
-                        nt5_ex.pdc_dns_name     = hostname;
-                        nt5_ex.domain_name      = lp_workgroup();
-                        nt5_ex.pdc_name         = global_myname();
-                        nt5_ex.user_name        = request.req.logon.user_name;
-                        nt5_ex.server_site      = "Default-First-Site-Name";
-                        nt5_ex.client_site      = "Default-First-Site-Name";
-                        nt5_ex.sockaddr_size    = 0x10; /* the w32 winsock addr size */
-                        nt5_ex.sockaddr         = saddr;
-                        nt5_ex.next_closest_site= NULL;
-                        nt5_ex.nt_version       = NETLOGON_NT_VERSION_1 |
-                                                  NETLOGON_NT_VERSION_5EX |
-                                                  NETLOGON_NT_VERSION_5EX_WITH_IP;
-                        nt5_ex.lmnt_token       = 0xffff;
-                        nt5_ex.lm20_token       = 0xffff;
-
-                        samlogon.ntver = NETLOGON_NT_VERSION_1 |
-                                         NETLOGON_NT_VERSION_5EX |
-                                         NETLOGON_NT_VERSION_5EX_WITH_IP;
-                        samlogon.data.nt5_ex = nt5_ex;
-
-                        if (DEBUGLEVEL >= 10) {
-                                NDR_PRINT_DEBUG(NETLOGON_SAM_LOGON_RESPONSE_EX, &nt5_ex);
-                        }
-                }
-#endif /* HAVE_ADS */
+                nt4.command             = user_unknown ? LOGON_SAM_LOGON_USER_UNKNOWN :
+                        LOGON_SAM_LOGON_RESPONSE;
+                nt4.pdc_name            = pdc_name;
+                nt4.user_name           = request.req.logon.user_name;
+                nt4.domain_name         = lp_workgroup();
+                nt4.nt_version          = NETLOGON_NT_VERSION_1;
+                nt4.lmnt_token          = 0xffff;
+                nt4.lm20_token          = 0xffff;
+                
+                samlogon.ntver = NETLOGON_NT_VERSION_1;
+                samlogon.data.nt4 = nt4;
+                
+                if (DEBUGLEVEL >= 10) {
+                        NDR_PRINT_DEBUG(NETLOGON_SAM_LOGON_RESPONSE_NT40, &nt4);
+                }
 
                 response.response_type = NETLOGON_SAMLOGON;
@@ -584 +506 @@
                 if (!NT_STATUS_IS_OK(status)) {
                         DEBUG(0,("process_logon_packet: failed to push packet\n"));
+                        SAFE_FREE(source_addr);
                         return;
                 }
@@ -605 +528 @@
                                   lp_init_logon_delay()));
 
-                        when = timeval_current_ofs(0,
-                                lp_init_logon_delay() * 1000);
+                        when = timeval_current_ofs_msec(lp_init_logon_delay());
                         p->locked = true;
-                        event_add_timed(nmbd_event_context(),
+                        tevent_add_timer(nmbd_event_context(),
                                         NULL,
                                         when,
@@ -623 +545 @@
                                 (char *)blob_out.data,
                                 blob_out.length,
-                                global_myname(), 0x0,
+                                lp_netbios_name(), 0x0,
                                 source_name,
                                 dgram->source_name.name_type,

vendor/current/source3/nmbd/nmbd_proto.h

@@ -29 +29 @@
 int asyncdns_fd(void);
 void kill_async_dns_child(void);
-void start_async_dns(void);
-void run_dns_queue(void);
+void start_async_dns(struct messaging_context *msg);
+void run_dns_queue(struct messaging_context *msg);
 bool queue_dns_query(struct packet_struct *p,struct nmb_name *question);
 bool queue_dns_query(struct packet_struct *p,struct nmb_name *question);
@@ -37 +37 @@
 /* The following definitions come from nmbd/nmbd.c  */
 
-struct event_context *nmbd_event_context(void);
-struct messaging_context *nmbd_messaging_context(void);
+struct tevent_context *nmbd_event_context(void);
 
 /* The following definitions come from nmbd/nmbd_become_dmb.c  */
@@ -47 +46 @@
 
 void insert_permanent_name_into_unicast( struct subnet_record *subrec,
-                                                struct nmb_name *nmbname, uint16 nb_type );
+                                                struct nmb_name *nmbname, uint16_t nb_type );
 void unbecome_local_master_browser(struct subnet_record *subrec, struct work_record *work,
                                    bool force_new_election);
@@ -139 +138 @@
                         const char *name,
                         int type,
-                        uint16 nb_flags,
+                        uint16_t nb_flags,
                         int ttl,
                         enum name_source source,
@@ -146 +145 @@
 void standard_success_register(struct subnet_record *subrec,
                              struct userdata_struct *userdata,
-                             struct nmb_name *nmbname, uint16 nb_flags, int ttl,
+                             struct nmb_name *nmbname, uint16_t nb_flags, int ttl,
                              struct in_addr registered_ip);
 void standard_fail_register( struct subnet_record   *subrec,
@@ -178 +177 @@
 
 void register_name(struct subnet_record *subrec,
-                   const char *name, int type, uint16 nb_flags,
+                   const char *name, int type, uint16_t nb_flags,
                    register_name_success_function success_fn,
                    register_name_fail_function fail_fn,
@@ -201 +200 @@
 bool nmbd_init_packet_server(void);
 
-uint16 get_nb_flags(char *buf);
-void set_nb_flags(char *buf, uint16 nb_flags);
+uint16_t get_nb_flags(char *buf);
+void set_nb_flags(char *buf, uint16_t nb_flags);
 struct response_record *queue_register_name( struct subnet_record *subrec,
                           response_function resp_fn,
@@ -210 +209 @@
                           struct userdata_struct *userdata,
                           struct nmb_name *nmbname,
-                          uint16 nb_flags);
+                          uint16_t nb_flags);
 void queue_wins_refresh(struct nmb_name *nmbname,
                         response_function resp_fn,
                         timeout_response_function timeout_fn,
-                        uint16 nb_flags,
+                        uint16_t nb_flags,
                         struct in_addr refresh_ip,
                         const char *tag);
@@ -224 +223 @@
                                                         struct userdata_struct *userdata,
                                                         struct nmb_name *nmbname,
-                                                        uint16 nb_flags,
+                                                        uint16_t nb_flags,
                                                         struct in_addr register_ip,
                                                         struct in_addr wins_ip);
@@ -234 +233 @@
                                             struct userdata_struct *userdata,
                                             struct nmb_name *nmbname,
-                                            uint16 nb_flags,
+                                            uint16_t nb_flags,
                                             struct in_addr release_ip,
                                             struct in_addr dest_ip);
@@ -265 +264 @@
 void run_packet_queue(void);
 void retransmit_or_expire_response_records(time_t t);
-bool listen_for_packets(bool run_election);
+bool listen_for_packets(struct messaging_context *msg, bool run_election);
 bool send_mailslot(bool unique, const char *mailslot,char *buf, size_t len,
                    const char *srcname, int src_type,
@@ -291 +290 @@
                                               struct userdata_struct *userdata);
 struct response_record *find_response_record(struct subnet_record **ppsubrec,
-                                uint16 id);
+                                uint16_t id);
 bool is_refresh_already_queued(struct subnet_record *subrec, struct name_record *namerec);
 
@@ -316 +315 @@
 void update_server_ttl(struct server_record *servrec, int ttl);
 void expire_servers(struct work_record *work, time_t t);
-void write_browse_list_entry(XFILE *fp, const char *name, uint32 rec_type,
+void write_browse_list_entry(XFILE *fp, const char *name, uint32_t rec_type,
                 const char *local_master_browser_name, const char *description);
 void write_browse_list(time_t t, bool force_write);

vendor/current/source3/nmbd/nmbd_responserecordsdb.c

@@ -38 +38 @@
                 rrec->response_id, subrec->subnet_name, num_response_packets));
 
-        DLIST_ADD_END(subrec->responselist, rrec, struct response_record *);
+        DLIST_ADD_END(subrec->responselist, rrec);
 }
 
@@ -170 +170 @@
 
 static struct response_record *find_response_record_on_subnet(
-                                struct subnet_record *subrec, uint16 id)
+                                struct subnet_record *subrec, uint16_t id)
 {  
         struct response_record *rrec = NULL;
@@ -189 +189 @@
 
 struct response_record *find_response_record(struct subnet_record **ppsubrec,
-                                uint16 id)
+                                uint16_t id)
 {  
         struct response_record *rrec = NULL;

vendor/current/source3/nmbd/nmbd_sendannounce.c

@@ -51 +51 @@
 
         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);
 }
@@ -77 +77 @@
         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);
 }
@@ -106 +106 @@
         SIVAL(p,1,announce_interval*1000); /* Milliseconds - despite the spec. */
 
-        safe_strcpy(upper_server_name, server_name, sizeof(upper_server_name)-1);
-        strupper_m(upper_server_name);
+        strlcpy(upper_server_name, server_name ? server_name : "", sizeof(upper_server_name));
+        if (!strupper_m(upper_server_name)) {
+                DEBUG(2,("strupper_m %s failed\n", upper_server_name));
+                return;
+        }
         push_string_check(p+5, upper_server_name, 16, STR_ASCII|STR_TERMINATE);
 
-        SCVAL(p,21,lp_major_announce_version()); /* Major version. */
-        SCVAL(p,22,lp_minor_announce_version()); /* Minor version. */
+        SCVAL(p,21,SAMBA_MAJOR_NBT_ANNOUNCE_VERSION); /* Major version. */
+        SCVAL(p,22,SAMBA_MINOR_NBT_ANNOUNCE_VERSION); /* Minor version. */
 
         SIVAL(p,23,server_type & ~SV_TYPE_LOCAL_LIST_ONLY);
@@ -141 +144 @@
         SSVAL(p,0,announce_type);
         SIVAL(p,2,server_type & ~SV_TYPE_LOCAL_LIST_ONLY);
-        SCVAL(p,6,lp_major_announce_version()); /* Major version. */
-        SCVAL(p,7,lp_minor_announce_version()); /* Minor version. */
+        SCVAL(p,6,SAMBA_MAJOR_NBT_ANNOUNCE_VERSION); /* Major version. */
+        SCVAL(p,7,SAMBA_MINOR_NBT_ANNOUNCE_VERSION); /* Minor version. */
         SSVAL(p,8,announce_interval);            /* In seconds - according to spec. */
 
@@ -162 +165 @@
 {
         /* Ensure we don't have the prohibited bit set. */
-        uint32 type = servrec->serv.type & ~SV_TYPE_LOCAL_LIST_ONLY;
+        uint32_t 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);
@@ -187 +190 @@
 
         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. */
@@ -193 +196 @@
                         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. */
 }
 
@@ -204 +207 @@
 {
         /* Ensure we don't have the prohibited bits set. */
-        uint32 type = servrec->serv.type & ~SV_TYPE_LOCAL_LIST_ONLY;
+        uint32_t type = servrec->serv.type & ~SV_TYPE_LOCAL_LIST_ONLY;
 
         DEBUG(3,("send_host_announcement: type %x for host %s on subnet %s for workgroup %s\n",
@@ -227 +230 @@
 {
         /* Ensure we don't have the prohibited bits set. */
-        uint32 type = servrec->serv.type & ~SV_TYPE_LOCAL_LIST_ONLY;
+        uint32_t type = servrec->serv.type & ~SV_TYPE_LOCAL_LIST_ONLY;
 
         DEBUG(3,("send_lm_host_announcement: type %x for host %s on subnet %s for workgroup %s, ttl: %d\n",
@@ -252 +255 @@
                 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);
@@ -471 +474 @@
         last_time = t;
 
-        s = lp_remote_announce();
+        s = lp_remote_announce(talloc_tos());
         if (!*s)
                 return;
 
-        comment = string_truncate(lp_serverstring(), MAX_SERVER_STRING_LENGTH);
+        comment = string_truncate(lp_server_string(talloc_tos()),
+                                  MAX_SERVER_STRING_LENGTH);
 
         frame = talloc_stackframe();
@@ -541 +545 @@
         last_time = t;
 
-        s = lp_remote_browse_sync();
+        s = lp_remote_browse_sync(talloc_tos());
         if (!*s)
                 return;
@@ -567 +571 @@
         p++;
 
-        unstrcpy(myname, global_myname());
-        strupper_m(myname);
+        unstrcpy(myname, lp_netbios_name());
+        if (!strupper_m(myname)) {
+                DEBUG(2,("strupper_m %s failed\n", myname));
+                return;
+        }
         myname[15]='\0';
         push_ascii(p, myname, sizeof(outbuf)-PTR_DIFF(p,outbuf)-1, STR_TERMINATE);
@@ -580 +587 @@
 
                 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);

vendor/current/source3/nmbd/nmbd_serverlistdb.c

@@ -55 +55 @@
                              struct server_record *servrec)
 {
-        DLIST_ADD_END(work->serverlist, servrec, struct server_record *);
+        DLIST_ADD_END(work->serverlist, servrec);
         work->subnet->work_changed = True;
 }
@@ -120 +120 @@
         fstrcpy(servrec->serv.name,name);
         fstrcpy(servrec->serv.comment,comment);
-        strupper_m(servrec->serv.name);
+        if (!strupper_m(servrec->serv.name)) {
+                DEBUG(2,("strupper_m %s failed\n", servrec->serv.name));
+                SAFE_FREE(servrec);
+                return NULL;
+        }
         servrec->serv.type  = servertype;
 
@@ -130 +134 @@
 workgroup %s.\n", name,servertype,comment, work->work_group));
  
-        work->subnet->work_changed = True;
- 
         return(servrec);
 }
@@ -148 +150 @@
         else
                 servrec->death_time = (ttl != PERMANENT_TTL) ? time(NULL)+(ttl*3) : PERMANENT_TTL;
-
-        servrec->subnet->work_changed = True;
 }
 
@@ -169 +169 @@
                         DEBUG(3,("expire_old_servers: Removing timed out server %s\n",servrec->serv.name));
                         remove_server_from_workgroup(work, servrec);
-                        work->subnet->work_changed = True;
                 }
         }
@@ -180 +179 @@
 ******************************************************************/
 
-static uint32 write_this_server_name( struct subnet_record *subrec,
+static uint32_t write_this_server_name( struct subnet_record *subrec,
                                       struct work_record *work,
                                       struct server_record *servrec)
@@ -218 +217 @@
 ******************************************************************/
 
-static uint32 write_this_workgroup_name( struct subnet_record *subrec, 
+static uint32_t write_this_workgroup_name( struct subnet_record *subrec,
                                          struct work_record *work)
 {
@@ -250 +249 @@
   ******************************************************************/
 
-void write_browse_list_entry(XFILE *fp, const char *name, uint32 rec_type,
+void write_browse_list_entry(XFILE *fp, const char *name, uint32_t rec_type,
                 const char *local_master_browser_name, const char *description)
 {
@@ -270 +269 @@
         char *fname;
         char *fnamenew;
-        uint32 stype;
+        uint32_t stype;
         int i;
         XFILE *fp;
@@ -308 +307 @@
                                 fname);
         if (!fnamenew) {
+                talloc_free(fname);
                 return;
         }
@@ -316 +316 @@
                 DEBUG(0,("write_browse_list: Can't open file %s. Error was %s\n",
                         fnamenew,strerror(errno)));
+                talloc_free(fnamenew);
+                talloc_free(fname);
                 return;
         }
@@ -328 +330 @@
                         lp_workgroup()));
                 x_fclose(fp);
+                talloc_free(fnamenew);
+                talloc_free(fname);
                 return;
         }
@@ -356 +360 @@
                 /* Output server details, plus what workgroup they're in. */
                 write_browse_list_entry(fp, my_netbios_names(i), stype,
-                        string_truncate(lp_serverstring(), MAX_SERVER_STRING_LENGTH), lp_workgroup());
+                        string_truncate(lp_server_string(talloc_tos()), MAX_SERVER_STRING_LENGTH), lp_workgroup());
         }
 
@@ -364 +368 @@
                 for (work = subrec->workgrouplist; work ; work = work->next) {
                         /* Write out a workgroup record for a workgroup. */
-                        uint32 wg_type = write_this_workgroup_name( subrec, work);
+                        uint32_t wg_type = write_this_workgroup_name( subrec, work);
 
                         if(wg_type) {
@@ -375 +379 @@
 
                         for (servrec = work->serverlist; servrec ; servrec = servrec->next) {
-                                uint32 serv_type;
+                                uint32_t serv_type;
 
                                 /* We have already written our names here. */
@@ -396 +400 @@
         rename(fnamenew,fname);
         DEBUG(3,("write_browse_list: Wrote browse list into file %s\n",fname));
-}
+        talloc_free(fnamenew);
+        talloc_free(fname);
+}

vendor/current/source3/nmbd/nmbd_subnetdb.c

@@ -38 +38 @@
 struct subnet_record *wins_server_subnet = NULL;
 
-extern uint16 samba_nb_type; /* Samba's NetBIOS name type. */
+extern uint16_t samba_nb_type; /* Samba's NetBIOS name type. */
 
 /****************************************************************************
@@ -248 +248 @@
         /* Only count IPv4, non-loopback interfaces. */
         if (iface_count_v4_nl() == 0) {
-                DEBUG(0,("create_subnets: No local IPv4 non-loopback interfaces !\n"));
-                DEBUG(0,("create_subnets: Waiting for an interface to appear ...\n"));
+                daemon_status("nmbd",
+                              "No local IPv4 non-loopback interfaces "
+                              "available, waiting for interface ...");
+                DEBUG(0,("NOTE: NetBIOS name resolution is not supported for "
+                         "Internet Protocol Version 6 (IPv6).\n"));
         }
 
@@ -305 +308 @@
                  */
 
-                if (is_loopback_addr((struct sockaddr *)&iface->ip)) {
+                if (is_loopback_addr((const struct sockaddr *)&iface->ip)) {
                         DEBUG(2,("create_subnets: Ignoring loopback interface.\n" ));
                         continue;

vendor/current/source3/nmbd/nmbd_synclists.c

@@ -5 +5 @@
    Copyright (C) Luke Kenneth Casson Leighton 1994-1998
    Copyright (C) Jeremy Allison 1994-1998
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-   
 */
 
@@ -33 +32 @@
 #include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
-#include "smbprofile.h"
+#include "../libcli/smb/smbXcli_base.h"
 
 struct sync_record {
@@ -54 +53 @@
   ******************************************************************/
 
-static void callback(const char *sname, uint32 stype, 
+static void callback(const char *sname, uint32_t stype,
                      const char *comment, void *state)
 {
@@ -73 +72 @@
         fstring unix_workgroup;
         struct cli_state *cli;
-        uint32 local_type = local ? SV_TYPE_LOCAL_LIST_ONLY : 0;
-        struct nmb_name called, calling;
+        uint32_t local_type = local ? SV_TYPE_LOCAL_LIST_ONLY : 0;
         struct sockaddr_storage ss;
         NTSTATUS status;
@@ -82 +80 @@
          */
 
-        cli = cli_initialise();
-        if (!cli) {
-                return;
-        }
-
-        cli_set_port(cli, 139);
-
         in_addr_to_sockaddr_storage(&ss, ip);
-        status = cli_connect(cli, name, &ss);
+
+        status = cli_connect_nb(name, &ss, NBT_SMB_PORT, nm_type,
+                                get_local_machine_name(), SMB_SIGNING_DEFAULT,
+                                0, &cli);
         if (!NT_STATUS_IS_OK(status)) {
-                cli_shutdown(cli);
-                return;
-        }
-
-        make_nmb_name(&calling, get_local_machine_name(), 0x0);
-        make_nmb_name(&called , name, nm_type);
-
-        if (!cli_session_request(cli, &calling, &called)) {
-                cli_shutdown(cli);
-                return;
-        }
-
-        status = cli_negprot(cli);
+                return;
+        }
+
+        status = smbXcli_negprot(cli->conn, cli->timeout, PROTOCOL_CORE,
+                                 PROTOCOL_NT1);
         if (!NT_STATUS_IS_OK(status)) {
                 cli_shutdown(cli);
@@ -116 +102 @@
         }
 
-        if (!NT_STATUS_IS_OK(cli_tcon_andx(cli, "IPC$", "IPC", "", 1))) {
+        if (!NT_STATUS_IS_OK(cli_tree_connect(cli, "IPC$", "IPC", "", 1))) {
                 cli_shutdown(cli);
                 return;
@@ -128 +114 @@
                           local_type|SV_TYPE_DOMAIN_ENUM, 
                           callback, NULL);
-        
+
         /* Now fetch a server list. */
         if (servers) {
@@ -136 +122 @@
                                   callback, NULL);
         }
-        
+
         cli_shutdown(cli);
 }
@@ -153 +139 @@
         static int counter;
 
-        START_PROFILE(sync_browse_lists);
         /* Check we're not trying to sync with ourselves. This can
            happen if we are a domain *and* a local master browser. */
         if (ismyip_v4(ip)) {
 done:
-                END_PROFILE(sync_browse_lists);
                 return;
         }
@@ -171 +155 @@
         s->ip = ip;
 
-        if (asprintf(&s->fname, "%s/sync.%d", lp_lockdir(), counter++) < 0) {
+        if (asprintf(&s->fname, "%s/sync.%d", lp_lock_directory(), counter++) < 0) {
                 SAFE_FREE(s);
                 goto done;
@@ -181 +165 @@
 
         /* the parent forks and returns, leaving the child to do the
-           actual sync and call END_PROFILE*/
+           actual sync */
         CatchChild();
-        if ((s->pid = sys_fork())) return;
+        if ((s->pid = fork())) return;
 
         BlockSignals( False, SIGTERM );
@@ -192 +176 @@
         fp = x_fopen(s->fname,O_WRONLY|O_CREAT|O_TRUNC, 0644);
         if (!fp) {
-                END_PROFILE(sync_browse_lists);
                 _exit(1);
         }
@@ -200 +183 @@
 
         x_fclose(fp);
-        END_PROFILE(sync_browse_lists);
         _exit(0);
 }
@@ -209 +191 @@
 
 static void complete_one(struct sync_record *s,
-                         char *sname, uint32 stype, char *comment)
+                         char *sname, uint32_t stype, char *comment)
 {
         struct work_record *work;

vendor/current/source3/nmbd/nmbd_winsproxy.c

@@ -35 +35 @@
         struct subnet_record *orig_broadcast_subnet;
         struct name_record *namerec = NULL;
-        uint16 nb_flags;
+        uint16_t nb_flags;
         int num_ips;
         int i;

vendor/current/source3/nmbd/nmbd_winsserver.c

@@ -9 +9 @@
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-   
+
    Converted to store WINS data in a tdb. Dec 2005. JRA.
 */
@@ -76 +76 @@
 
 /****************************************************************************
- Convert a wins.tdb record to a struct name_record. Add in our global_scope().
+ Convert a wins.tdb record to a struct name_record. Add in our lp_netbios_scope().
 *****************************************************************************/
 
@@ -82 +82 @@
 {
         struct name_record *namerec = NULL;
-        uint16 nb_flags;
+        uint16_t nb_flags;
         unsigned char nr_src;
-        uint32 death_time, refresh_time;
-        uint32 id_low, id_high;
-        uint32 saddr;
-        uint32 wins_flags;
-        uint32 num_ips;
+        uint32_t death_time, refresh_time;
+        uint32_t id_low, id_high;
+        uint32_t saddr;
+        uint32_t wins_flags;
+        uint32_t num_ips;
         size_t len;
         int i;
@@ -129 +129 @@
         namerec->name.name_type = key.dptr[sizeof(unstring)];
         /* Add the scope. */
-        push_ascii(namerec->name.scope, global_scope(), 64, STR_TERMINATE);
+        push_ascii(namerec->name.scope, lp_netbios_scope(), 64, STR_TERMINATE);
 
         /* We're using a byte-by-byte compare, so we must be sure that
          * unused space doesn't have garbage in it.
          */
-                                                                                                                               
+
         for( i = strlen( namerec->name.name ); i < sizeof( namerec->name.name ); i++ ) {
                 namerec->name.name[i] = '\0';
@@ -147 +147 @@
         namerec->data.refresh_time = (time_t)refresh_time;
         namerec->data.id = id_low;
-#if defined(HAVE_LONGLONG)
         namerec->data.id |= ((uint64_t)id_high << 32);
-#endif
         namerec->data.wins_ip.s_addr = saddr;
         namerec->data.wins_flags = wins_flags,
@@ -170 +168 @@
         size_t len = 0;
         int i;
-        uint32 id_low = (namerec->data.id & 0xFFFFFFFF);
-#if defined(HAVE_LONGLONG)
-        uint32 id_high = (namerec->data.id >> 32) & 0xFFFFFFFF;
-#else
-        uint32 id_high = 0;
-#endif
+        uint32_t id_low = (namerec->data.id & 0xFFFFFFFF);
+        uint32_t id_high = (namerec->data.id >> 32) & 0xFFFFFFFF;
 
         ZERO_STRUCT(data);
@@ -182 +176 @@
         len += (namerec->data.num_ips * 4);
 
-        data.dptr = (uint8 *)SMB_MALLOC(len);
+        data.dptr = (uint8_t *)SMB_MALLOC(len);
         if (!data.dptr) {
                 return data;
@@ -191 +185 @@
                         namerec->data.nb_flags,
                         (unsigned char)namerec->data.source,
-                        (uint32)namerec->data.death_time,
-                        (uint32)namerec->data.refresh_time,
+                        (uint32_t)namerec->data.death_time,
+                        (uint32_t)namerec->data.refresh_time,
                         id_low,
                         id_high,
-                        (uint32)namerec->data.wins_ip.s_addr,
-                        (uint32)namerec->data.wins_flags,
-                        (uint32)namerec->data.num_ips );
+                        (uint32_t)namerec->data.wins_ip.s_addr,
+                        (uint32_t)namerec->data.wins_flags,
+                        (uint32_t)namerec->data.num_ips );
 
         for (i = 0; i < namerec->data.num_ips; i++) {
@@ -218 +212 @@
 
         pull_ascii_nstring(keydata, sizeof(unstring), nmbname->name);
-        strupper_m(keydata);
+        (void)strupper_m(keydata);
         keydata[sizeof(unstring)] = nmbname->name_type;
-        key.dptr = (uint8 *)keydata;
+        key.dptr = (uint8_t *)keydata;
         key.dsize = sizeof(keydata);
 
@@ -277 +271 @@
                 }
         }
-        
+
         DLIST_ADD(wins_server_subnet->namelist, namerec);
         return namerec;
@@ -446 +440 @@
 
         DEBUG(5,("get_global_id_and_update: updating version ID: %d\n", (int)general_id));
-        
+
         *current_id = general_id;
-        
+
         if (update) {
                 general_id++;
@@ -462 +456 @@
 {
         char *command = NULL;
-        char *cmd = lp_wins_hook();
+        char *cmd = lp_wins_hook(talloc_tos());
         char *p, *namestr;
         int i;
@@ -479 +473 @@
                 }
         }
-        
+
         /* Use the name without the nametype (and scope) appended */
 
@@ -601 +595 @@
         XFILE *fp;
         char line[1024];
+        char *db_path;
+        char *list_path;
 
         if(!lp_we_are_a_wins_server()) {
@@ -606 +602 @@
         }
 
+        db_path = state_path("wins.tdb");
+        if (db_path == NULL) {
+                return false;
+        }
+
         /* Open the wins.tdb. */
-        wins_tdb = tdb_open_log(state_path("wins.tdb"), 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
+        wins_tdb = tdb_open_log(db_path, 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
                         O_CREAT|O_RDWR, 0600);
+        TALLOC_FREE(db_path);
         if (!wins_tdb) {
                 DEBUG(0,("initialise_wins: failed to open wins.tdb. Error was %s\n",
@@ -619 +621 @@
         add_samba_names_to_subnet(wins_server_subnet);
 
-        if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL) {
+        list_path = state_path(WINS_LIST);
+        if (list_path == NULL) {
+                tdb_close(wins_tdb);
+                return false;
+        }
+
+        fp = x_fopen(list_path, O_RDONLY, 0);
+        TALLOC_FREE(list_path);
+        if (fp == NULL) {
                 DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
                         WINS_LIST, strerror(errno) ));
@@ -853 +863 @@
         struct nmb_name *question = &nmb->question.question_name;
         bool bcast = nmb->header.nm_flags.bcast;
-        uint16 nb_flags = get_nb_flags(nmb->additional->rdata);
+        uint16_t nb_flags = get_nb_flags(nmb->additional->rdata);
         bool group = (nb_flags & NB_GROUP) ? True : False;
         struct name_record *namerec = NULL;
@@ -1160 +1170 @@
         struct nmb_name *question = &nmb->question.question_name;
         bool bcast = nmb->header.nm_flags.bcast;
-        uint16 nb_flags = get_nb_flags(nmb->additional->rdata);
+        uint16_t nb_flags = get_nb_flags(nmb->additional->rdata);
         int ttl = get_ttl_from_packet(nmb);
         struct name_record *namerec = NULL;
@@ -1610 +1620 @@
         struct nmb_name *question = &nmb->question.question_name;
         bool bcast = nmb->header.nm_flags.bcast;
-        uint16 nb_flags = get_nb_flags(nmb->additional->rdata);
+        uint16_t nb_flags = get_nb_flags(nmb->additional->rdata);
         int ttl = get_ttl_from_packet(nmb);
         struct name_record *namerec = NULL;
@@ -1675 +1685 @@
                 namerec = NULL;
         }
-  
+
         /*
          * Deal with the case where the name found was a dns entry.
@@ -1768 +1778 @@
                         update_wins_flag(namerec, WINS_ACTIVE);
                 }
-    
+
                 wins_hook("refresh", namerec, ttl);
                 send_wins_name_registration_response(0, ttl, p);
@@ -1878 +1888 @@
  Deal with the special name query for *<1b>.
 ***********************************************************************/
-   
-static void process_wins_dmb_query_request(struct subnet_record *subrec,  
+
+static void process_wins_dmb_query_request(struct subnet_record *subrec,
                                            struct packet_struct *p)
-{  
+{
         struct name_record *namerec = NULL;
         char *prdata;
@@ -2093 +2103 @@
          */
 
-        if(lp_dns_proxy() && ((question->name_type == 0x20) || question->name_type == 0)) {
+        if(lp_wins_dns_proxy() && ((question->name_type == 0x20) || question->name_type == 0)) {
                 DEBUG(3,("wins_process_name_query: name query for name %s not found - doing dns lookup.\n",
                                 nmb_namestr(question) ));
@@ -2138 +2148 @@
         struct nmb_name *question = &nmb->question.question_name;
         bool bcast = nmb->header.nm_flags.bcast;
-        uint16 nb_flags = get_nb_flags(nmb->additional->rdata);
+        uint16_t nb_flags = get_nb_flags(nmb->additional->rdata);
         struct name_record *namerec = NULL;
         struct in_addr from_ip;
@@ -2157 +2167 @@
                 return;
         }
-  
+
         DEBUG(3,("wins_process_name_release_request: %s name release for name %s \
 IP %s\n", releasing_group_name ? "Group" : "Unique", nmb_namestr(question), inet_ntoa(from_ip) ));
-    
+
         /*
          * Deal with policy regarding 0x1d names.
@@ -2175 +2185 @@
          * See if the name already exists.
          */
-    
+
         namerec = find_name_on_subnet(subrec, question, FIND_ANY_NAME);
 
@@ -2471 +2481 @@
         if (background) {
                 CatchChild();
-                if (sys_fork()) {
+                if (fork()) {
                         return;
                 }
@@ -2488 +2498 @@
         all_string_sub(fname,"//", "/", 0);
 
-        if (asprintf(&fnamenew, "%s.%u", fname, (unsigned int)sys_getpid()) < 0) {
+        if (asprintf(&fnamenew, "%s.%u", fname, (unsigned int)getpid()) < 0) {
                 goto err_exit;
         }
@@ -2542 +2552 @@
                 return;
         }
-        
+
         /* Record should use UNIX codepage. Ensure this is so in the wrepld code. JRA. */
         record=(WINS_RECORD *)buf;
-        
+
         make_nmb_name(&question, record->name, record->type);
 
@@ -2593 +2603 @@
                                         else
                                                 overwrite=True;
-                                
+
                                 } else {
                                 /* the 2 records have different IP address */
@@ -2608 +2618 @@
                         }
                 }
-                
+
                 /* the replica is a standard group */
                 if (record->wins_flags&WINS_NGROUP || record->wins_flags&WINS_SGROUP) {
@@ -2616 +2626 @@
                                 ;
                         overwrite=True;
-                
-                }
-        
+
+                }
+
                 /* the replica is a special group */
                 if (record->wins_flags&WINS_SGROUP && namerec->data.wins_flags&WINS_SGROUP) {
@@ -2629 +2639 @@
                         }
                 }
-                
+
                 /* the replica is a multihomed host */
-                
+
                 /* I'm giving up on multi homed. Too much complex to understand */
-                
+
                 if (record->wins_flags&WINS_MHOMED) {
                         if (! (namerec->data.wins_flags&WINS_ACTIVE)) {
@@ -2642 +2652 @@
                                 if (ip_equal_v4(record->wins_ip, namerec->data.wins_ip))
                                         overwrite=True;
-                                
+
                                 if (ip_equal_v4(namerec->data.wins_ip, our_fake_ip))
                                         if (namerec->data.wins_flags&WINS_UNIQUE)
                                                 get_global_id_and_update(&namerec->data.id, True);
-                                
+
                         }
-                        
+
                         if (record->wins_flags&WINS_ACTIVE && namerec->data.wins_flags&WINS_ACTIVE)
                                 if (namerec->data.wins_flags&WINS_UNIQUE ||
@@ -2654 +2664 @@
                                         if (ip_equal_v4(record->wins_ip, namerec->data.wins_ip))
                                                 overwrite=True;
-                                
+
                 }
 

vendor/current/source3/nmbd/nmbd_workgroupdb.c

@@ -25 +25 @@
 #include "nmbd/nmbd.h"
 
-extern uint16 samba_nb_type;
+extern uint16_t samba_nb_type;
 
 int workgroup_count = 0; /* unique index key: one for each workgroup */
@@ -53 +53 @@
                 unstring tname;
                 pull_ascii_nstring(tname, sizeof(tname), nname);
-                unstrcpy(unname, tname);
+                strlcpy(unname, tname, sizeof(nname));
                 DEBUG(0,("name_to_nstring: workgroup name %s is too long. Truncating to %s\n",
                         name, tname));
@@ -251 +251 @@
                 int stype = lp_default_server_announce() | (lp_local_master() ?  SV_TYPE_POTENTIAL_BROWSER : 0 );
    
-                if(!strequal(global_myname(), name))
+                if(!strequal(lp_netbios_name(), name))
                         stype &= ~(SV_TYPE_MASTER_BROWSER|SV_TYPE_POTENTIAL_BROWSER|SV_TYPE_DOMAIN_MASTER|SV_TYPE_DOMAIN_MEMBER);
    
                 create_server_on_workgroup(work,name,stype|SV_TYPE_LOCAL_LIST_ONLY, PERMANENT_TTL, 
-                                string_truncate(lp_serverstring(), MAX_SERVER_STRING_LENGTH));
+                                string_truncate(lp_server_string(talloc_tos()), MAX_SERVER_STRING_LENGTH));
                 DEBUG(3,("initiate_myworkgroup_startup: Added server name entry %s \
 on subnet %s\n", name, subrec->subnet_name));