Changeset 745 for trunk/server/source3/nmbd

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/nmbd/asyncdns.c (modified) (6 diffs)
• source3/nmbd/nmbd.c (modified) (16 diffs)
• source3/nmbd/nmbd.h (copied) (copied from vendor/current/source3/nmbd/nmbd.h )
• source3/nmbd/nmbd_become_dmb.c (modified) (1 diff)
• source3/nmbd/nmbd_become_lmb.c (modified) (1 diff)
• source3/nmbd/nmbd_browserdb.c (modified) (1 diff)
• source3/nmbd/nmbd_browsesync.c (modified) (2 diffs)
• source3/nmbd/nmbd_elections.c (modified) (2 diffs)
• source3/nmbd/nmbd_incomingdgrams.c (modified) (11 diffs)
• source3/nmbd/nmbd_incomingrequests.c (modified) (2 diffs)
• source3/nmbd/nmbd_lmhosts.c (modified) (1 diff)
• source3/nmbd/nmbd_logonnames.c (modified) (1 diff)
• source3/nmbd/nmbd_mynames.c (modified) (1 diff)
• source3/nmbd/nmbd_namelistdb.c (modified) (1 diff)
• source3/nmbd/nmbd_namequery.c (modified) (1 diff)
• source3/nmbd/nmbd_nameregister.c (modified) (1 diff)
• source3/nmbd/nmbd_namerelease.c (modified) (1 diff)
• source3/nmbd/nmbd_nodestatus.c (modified) (1 diff)
• source3/nmbd/nmbd_packets.c (modified) (38 diffs)
• source3/nmbd/nmbd_processlogon.c (modified) (9 diffs)
• source3/nmbd/nmbd_proto.h (copied) (copied from vendor/current/source3/nmbd/nmbd_proto.h )
• source3/nmbd/nmbd_responserecordsdb.c (modified) (1 diff)
• source3/nmbd/nmbd_sendannounce.c (modified) (1 diff)
• source3/nmbd/nmbd_serverlistdb.c (modified) (4 diffs)
• source3/nmbd/nmbd_subnetdb.c (modified) (4 diffs)
• source3/nmbd/nmbd_synclists.c (modified) (1 diff)
• source3/nmbd/nmbd_winsproxy.c (modified) (1 diff)
• source3/nmbd/nmbd_winsserver.c (modified) (9 diffs)
• source3/nmbd/nmbd_workgroupdb.c (modified) (2 diffs)

trunk/server/source3/nmbd/asyncdns.c

@@ -19 +19 @@
 
 #include "includes.h"
-
+#include "nmbd/nmbd.h"
 #ifdef __OS2__
 #define pipe(A) os2_pipe(A)
@@ -142 +142 @@
 {
         int fd1[2], fd2[2];
+        NTSTATUS status;
 
         CatchChild();
@@ -167 +168 @@
         CatchSignal(SIGUSR1, SIG_IGN);
         CatchSignal(SIGHUP, SIG_IGN);
-        CatchSignal(SIGTERM, SIGNAL_CAST sig_term );
-
-        if (!NT_STATUS_IS_OK(reinit_after_fork(nmbd_messaging_context(),
-                                               nmbd_event_context(), true))) {
+        CatchSignal(SIGTERM, sig_term);
+
+        status = reinit_after_fork(nmbd_messaging_context(),
+                                   nmbd_event_context(),
+                                   procid_self(), true);
+
+        if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0,("reinit_after_fork() failed\n"));
                 smb_panic("reinit_after_fork() failed");
@@ -263 +267 @@
                         p->locked = False;
 
-                        if (p->prev)
-                                p->prev->next = p->next;
-                        else
-                                dns_queue = p->next;
-                        if (p->next)
-                                p->next->prev = p->prev;
                         p2 = p->next;
+                        DLIST_REMOVE(dns_queue, p);
                         free_packet(p);
                         p = p2;
@@ -279 +278 @@
         if (dns_queue) {
                 dns_current = dns_queue;
-                dns_queue = dns_queue->next;
-                if (dns_queue)
-                        dns_queue->prev = NULL;
-                dns_current->next = NULL;
+                DLIST_REMOVE(dns_queue, dns_queue);
 
                 if (!write_child(dns_current)) {
@@ -309 +305 @@
         } else {
                 p->locked = True;
-                p->next = dns_queue;
-                p->prev = NULL;
-                if (p->next)
-                        p->next->prev = p;
-                dns_queue = p;
+                DLIST_ADD(dns_queue, p);
         }
 

trunk/server/source3/nmbd/nmbd.c

@@ -5 +5 @@
    Copyright (C) Jeremy Allison 1997-2002
    Copyright (C) Jelmer Vernooij 2002,2003 (Conversion to popt)
-   
+
    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/>.
-   
 */
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "popt_common.h"
+#include "nmbd/nmbd.h"
+#include "serverid.h"
+#include "messages.h"
 
 int ClientNMB       = -1;
@@ -45 +49 @@
 struct event_context *nmbd_event_context(void)
 {
-        static struct event_context *ctx;
-
-        if (!ctx && !(ctx = event_context_init(NULL))) {
-                smb_panic("Could not init nmbd event context");
-        }
-        return ctx;
+        return server_event_context();
 }
 
 struct messaging_context *nmbd_messaging_context(void)
 {
-        static struct messaging_context *ctx;
-
-        if (ctx == NULL) {
-                ctx = messaging_init(NULL, server_id_self(),
-                                     nmbd_event_context());
-        }
-        if (ctx == NULL) {
-                DEBUG(0, ("Could not init nmbd messaging context.\n"));
-        }
-        return ctx;
+        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;
 }
 
@@ -88 +83 @@
 
         gencache_stabilize();
+        serverid_deregister(procid_self());
 
         pidfile_unlink();
@@ -258 +254 @@
                 }
 
-                ip = ((struct sockaddr_in *)&iface->ip)->sin_addr;
-                nmask = ((struct sockaddr_in *)&iface->netmask)->sin_addr;
+                ip = ((struct sockaddr_in *)(void *)&iface->ip)->sin_addr;
+                nmask = ((struct sockaddr_in *)(void *)
+                         &iface->netmask)->sin_addr;
 
                 /*
@@ -267 +264 @@
                  */
 
-                if (is_loopback_addr((struct sockaddr *)&iface->ip)) {
+                if (is_loopback_addr((struct sockaddr *)(void *)&iface->ip)) {
                         DEBUG(2,("reload_interfaces: Ignoring loopback "
                                 "interface %s\n",
@@ -306 +303 @@
                                 continue;
                         }
-                        ip = ((struct sockaddr_in *)&iface->ip)->sin_addr;
-                        nmask = ((struct sockaddr_in *)&iface->netmask)->sin_addr;
+                        ip = ((struct sockaddr_in *)(void *)
+                              &iface->ip)->sin_addr;
+                        nmask = ((struct sockaddr_in *)(void *)
+                                 &iface->netmask)->sin_addr;
                         if (ip_equal_v4(ip, subrec->myip) &&
                             ip_equal_v4(nmask, subrec->mask_ip)) {
@@ -342 +341 @@
                  * cause us to exit.
                  */
-                saved_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
+                saved_handler = CatchSignal(SIGTERM, SIG_DFL);
 
                 /* We only count IPv4, non-loopback interfaces here. */
@@ -350 +349 @@
                 }
 
-                CatchSignal( SIGTERM, SIGNAL_CAST saved_handler );
+                CatchSignal(SIGTERM, saved_handler);
 
                 /*
@@ -447 +446 @@
 
         in_addr_to_sockaddr_storage(&ss, p->ip);
-        pss = iface_ip((struct sockaddr *)&ss);
+        pss = iface_ip((struct sockaddr *)(void *)&ss);
 
         if (pss == NULL) {
@@ -672 +671 @@
                 if (lp_enhanced_browsing())
                         sync_all_dmbs(t);
-
-                /*
-                 * clear the unexpected packet queue 
-                 */
-
-                clear_unexpected(t);
 
                 /* check for new network interfaces */
@@ -788 +781 @@
         { NULL }
         };
-        TALLOC_CTX *frame = talloc_stackframe(); /* Setup tos. */
+        TALLOC_CTX *frame;
+        NTSTATUS status;
+
+        /*
+         * Do this before any other talloc operation
+         */
+        talloc_enable_null_tracking();
+        frame = talloc_stackframe();
 
 #ifdef __OS2__
@@ -868 +868 @@
                 exit(1);
         }
-
-        setup_logging( argv[0], log_stdout );
+        if (log_stdout) {
+                setup_logging( argv[0], DEBUG_STDOUT);
+        } else {
+                setup_logging( argv[0], DEBUG_FILE);
+        }
 
         reopen_logs();
@@ -907 +910 @@
         if (is_daemon && !opt_interactive) {
                 DEBUG( 2, ( "Becoming a daemon.\n" ) );
-                become_daemon(Fork, no_process_group);
+                become_daemon(Fork, no_process_group, log_stdout);
         }
 
@@ -937 +940 @@
         pidfile_create("nmbd");
 
-        if (!NT_STATUS_IS_OK(reinit_after_fork(nmbd_messaging_context(),
-                                               nmbd_event_context(), false))) {
+        status = reinit_after_fork(nmbd_messaging_context(),
+                                   nmbd_event_context(),
+                                   procid_self(), false);
+
+        if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0,("reinit_after_fork() failed\n"));
                 exit(1);
@@ -949 +955 @@
 
         /* get broadcast messages */
-        claim_connection(NULL,"",FLAG_MSG_GENERAL|FLAG_MSG_DBWRAP);
+
+        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,
@@ -1018 +1029 @@
         }
 
+        if (!nmbd_init_packet_server()) {
+                kill_async_dns_child();
+                exit(1);
+        }
+
         TALLOC_FREE(frame);
         process();
 
-        if (dbf)
-                x_fclose(dbf);
         kill_async_dns_child();
         return(0);

trunk/server/source3/nmbd/nmbd_become_dmb.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
+#include "nmbd/nmbd.h"
 
 extern uint16 samba_nb_type; /* Samba's NetBIOS type. */

trunk/server/source3/nmbd/nmbd_become_lmb.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
+#include "../librpc/gen_ndr/svcctl.h"
 
 extern uint16 samba_nb_type; /* Samba's NetBIOS name type. */

trunk/server/source3/nmbd/nmbd_browserdb.c

@@ -28 +28 @@
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
 
 /* -------------------------------------------------------------------------- **

trunk/server/source3/nmbd/nmbd_browsesync.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
 
 /* This is our local master browser list database. */
@@ -645 +646 @@
         }
 
+        /* leave if we don't have to do any syncs */
+        if (count == 0) {
+                return;
+        }
+
         /* sync with a probability of 1/count */
         for (work=unicast_subnet->workgrouplist; work; work = work->next) {

trunk/server/source3/nmbd/nmbd_elections.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
+#include "smbprofile.h"
 
 /* Election parameters. */
@@ -257 +259 @@
 ******************************************************************/
 
-void process_election(struct subnet_record *subrec, struct packet_struct *p, char *buf)
+void process_election(struct subnet_record *subrec, struct packet_struct *p, const char *buf)
 {
         struct dgram_packet *dgram = &p->packet.dgram;

trunk/server/source3/nmbd/nmbd_incomingdgrams.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
+#include "nmbd/nmbd.h"
+#include "smbprofile.h"
 
 extern bool found_lm_clients;
@@ -93 +96 @@
 *******************************************************************/
 
-void process_host_announce(struct subnet_record *subrec, struct packet_struct *p, char *buf)
+void process_host_announce(struct subnet_record *subrec, struct packet_struct *p, const char *buf)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -193 +196 @@
 *******************************************************************/
 
-void process_workgroup_announce(struct subnet_record *subrec, struct packet_struct *p, char *buf)
+void process_workgroup_announce(struct subnet_record *subrec, struct packet_struct *p, const char *buf)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -250 +253 @@
 *******************************************************************/
 
-void process_local_master_announce(struct subnet_record *subrec, struct packet_struct *p, char *buf)
+void process_local_master_announce(struct subnet_record *subrec, struct packet_struct *p, const char *buf)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -365 +368 @@
 
 void process_master_browser_announce(struct subnet_record *subrec, 
-                                     struct packet_struct *p,char *buf)
+                                     struct packet_struct *p,const char *buf)
 {
         unstring local_master_name;
@@ -416 +419 @@
 *******************************************************************/
 
-void process_lm_host_announce(struct subnet_record *subrec, struct packet_struct *p, char *buf, int len)
+void process_lm_host_announce(struct subnet_record *subrec, struct packet_struct *p, const char *buf, int len)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -429 +432 @@
         unstring source_name;
         fstring comment;
-        char *s = get_safe_str_ptr(buf,len,buf,9);
+        char *s = get_safe_str_ptr(buf,len,discard_const_p(char, buf),9);
 
         START_PROFILE(lm_host_announce);
@@ -639 +642 @@
 
 void process_get_backup_list_request(struct subnet_record *subrec,
-                                     struct packet_struct *p,char *buf)
+                                     struct packet_struct *p,const char *buf)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -722 +725 @@
 
 void process_reset_browser(struct subnet_record *subrec,
-                                  struct packet_struct *p,char *buf)
+                                  struct packet_struct *p,const char *buf)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -774 +777 @@
 ******************************************************************/
 
-void process_announce_request(struct subnet_record *subrec, struct packet_struct *p, char *buf)
+void process_announce_request(struct subnet_record *subrec, struct packet_struct *p, const char *buf)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -815 +818 @@
 ******************************************************************/
 
-void process_lm_announce_request(struct subnet_record *subrec, struct packet_struct *p, char *buf, int len)
+void process_lm_announce_request(struct subnet_record *subrec, struct packet_struct *p, const char *buf, int len)
 {
         struct dgram_packet *dgram = &p->packet.dgram;

trunk/server/source3/nmbd/nmbd_incomingrequests.c

@@ -26 +26 @@
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
 
 /****************************************************************************
@@ -374 +375 @@
                 /* Remove duplicate names. */
                 if (names_added > 1) {
+                        /* TODO: should use a real type and
+                           TYPESAFE_QSORT() */
                         qsort( buf0, names_added, 18, QSORT_CAST status_compare );
                 }

trunk/server/source3/nmbd/nmbd_lmhosts.c

@@ -24 +24 @@
 
 #include "includes.h"
+#include "../libcli/nbt/libnbt.h"
+#include "nmbd/nmbd.h"
 
 /****************************************************************************

trunk/server/source3/nmbd/nmbd_logonnames.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
+#include "nmbd/nmbd.h"
 
 extern uint16 samba_nb_type; /* Samba's NetBIOS type. */

trunk/server/source3/nmbd/nmbd_mynames.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
 
 extern uint16 samba_nb_type; /* Samba's NetBIOS type. */

trunk/server/source3/nmbd/nmbd_namelistdb.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "nmbd/nmbd.h"
 
 uint16 samba_nb_type = 0; /* samba's NetBIOS name type */

trunk/server/source3/nmbd/nmbd_namequery.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
 
 /****************************************************************************

trunk/server/source3/nmbd/nmbd_nameregister.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
 
 /* forward declarations */

trunk/server/source3/nmbd/nmbd_namerelease.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
 
 /****************************************************************************

trunk/server/source3/nmbd/nmbd_nodestatus.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
 
 /****************************************************************************

trunk/server/source3/nmbd/nmbd_packets.c

@@ -5 +5 @@
    Copyright (C) Luke Kenneth Casson Leighton 1994-1998
    Copyright (C) Jeremy Allison 1994-2003
-   
+
    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/>.
-   
 */
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
+#include "../lib/util/select.h"
+#include "system/select.h"
+#include "libsmb/libsmb.h"
 
 extern int ClientNMB;
@@ -30 +33 @@
 
 bool rescan_listen_set = False;
+
+static struct nb_packet_server *packet_server;
+
+bool nmbd_init_packet_server(void)
+{
+        NTSTATUS status;
+
+        status = nb_packet_server_create(
+                NULL, nmbd_event_context(),
+                lp_parm_int(-1, "nmbd", "unexpected_clients", 200),
+                &packet_server);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, ("ERROR: nb_packet_server_create failed: %s\n",
+                          nt_errstr(status)));
+                return false;
+        }
+        return true;
+}
 
 
@@ -89 +110 @@
 **************************************************************************/
 
-static void debug_browse_data(char *outbuf, int len)
+static void debug_browse_data(const char *outbuf, int len)
 {
         int i,j;
@@ -105 +126 @@
                         if (x < 32 || x > 127) 
                                 x = '.';
-            
+
                         DEBUGADD( 4, ( "%c", x ) );
                 }
@@ -159 +180 @@
                 return False;
         }
-  
+
         return True;
 } 
@@ -184 +205 @@
                 return NULL;
         }
-    
+
         memset((char *)packet,'\0',sizeof(*packet));
 
@@ -196 +217 @@
         nmb->header.nm_flags.authoritative = False;
         nmb->header.nm_flags.bcast = bcast;
-  
+
         nmb->header.rcode = 0;
         nmb->header.qdcount = 1;
@@ -213 +234 @@
         packet->packet_type = NMB_PACKET;
         packet->locked = False;
-  
+
         return packet; /* Caller must free. */
 }
@@ -237 +258 @@
         nmb->additional->rr_type  = RR_TYPE_NB;
         nmb->additional->rr_class = RR_CLASS_IN;
-        
+
         /* See RFC 1002, sections 5.1.1.1, 5.1.1.2 and 5.1.1.3 */
         if (nmb->header.nm_flags.bcast)
@@ -243 +264 @@
         else
                 nmb->additional->ttl = lp_max_ttl();
-        
+
         nmb->additional->rdlength = 6;
-        
+
         set_nb_flags(nmb->additional->rdata,nb_flags);
-        
+
         /* Set the address for the name we are registering. */
         putip(&nmb->additional->rdata[2], register_ip);
-        
+
         /* 
            it turns out that Jeremys code was correct, we are supposed
@@ -295 +316 @@
 {   
         struct nmb_packet *nmb = NULL;
-  
+
         nmb = &packet->packet.nmb;
 
         nmb->header.opcode = NMB_NAME_QUERY_OPCODE;
         nmb->header.arcount = 0;
-    
+
         nmb->header.nm_flags.recursion_desired = False;
-  
+
         DEBUG(4,("initiate_name_query_packet_from_wins_server: sending query for name %s (bcast=%s) to IP %s\n",
                 nmb_namestr(&nmb->question.question_name),
                 BOOLSTR(nmb->header.nm_flags.bcast), inet_ntoa(packet->ip)));
-    
+
         return send_netbios_packet( packet );
 } 
@@ -350 +371 @@
 
         nmb->header.nm_flags.recursion_desired = True;
-        
+
         if(create_and_init_additional_record(packet, nb_flags, register_ip) == False)
                 return False;
-        
+
         DEBUG(4,("initiate_multihomed_name_register_packet: sending registration \
 for name %s IP %s (bcast=%s) to IP %s\n",
@@ -479 +500 @@
 
         in_addr_to_sockaddr_storage(&ss, subrec->bcast_ip);
-        pss = iface_ip((struct sockaddr *)&ss);
+        pss = iface_ip((struct sockaddr *)(void *)&ss);
         if (!pss || pss->ss_family != AF_INET) {
                 p->locked = False;
@@ -589 +610 @@
         struct response_record *rrec;
         bool ret;
-        
+
         /* Sanity check. */
         if(subrec != unicast_subnet) {
@@ -599 +620 @@
         if(assert_check_subnet(subrec))
                 return NULL;
-     
+
         if ((p = create_and_init_netbios_packet(nmbname, False, True, wins_ip)) == NULL)
                 return NULL;
@@ -613 +634 @@
                 return NULL;
         }  
-  
+
         if ((rrec = make_response_record(subrec,    /* subnet record. */
                                          p,                     /* packet we sent. */
@@ -625 +646 @@
                 return NULL;
         }  
-        
+
         return rrec;
 }
@@ -687 +708 @@
  Queue a query name packet to the broadcast address of a subnet.
 ****************************************************************************/
- 
+
 struct response_record *queue_query_name( struct subnet_record *subrec,
                           response_function resp_fn,
@@ -704 +725 @@
 
         to_ip = subrec->bcast_ip;
-  
+
         /* queries to the WINS server turn up here as queries to IP 0.0.0.0 
                         These need to be handled a bit differently */
@@ -1012 +1033 @@
 void queue_packet(struct packet_struct *packet)
 {
-        struct packet_struct *p;
-
-        if (!packet_queue) {
-                packet->prev = NULL;
-                packet->next = NULL;
-                packet_queue = packet;
-                return;
-        }
-
-        /* find the bottom */
-        for (p=packet_queue;p->next;p=p->next)
-                ;
-
-        p->next = packet;
-        packet->next = NULL;
-        packet->prev = p;
+        DLIST_ADD_END(packet_queue, packet, struct packet_struct *);
 }
 
@@ -1058 +1064 @@
 ****************************************************************************/
 
-static void process_browse_packet(struct packet_struct *p, char *buf,int len)
+static void process_browse_packet(struct packet_struct *p, const char *buf,int len)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -1145 +1151 @@
 ****************************************************************************/
 
-static void process_lanman_packet(struct packet_struct *p, char *buf,int len)
+static void process_lanman_packet(struct packet_struct *p, const char *buf,int len)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -1212 +1218 @@
 static void process_dgram(struct packet_struct *p)
 {
-        char *buf;
-        char *buf2;
+        const char *buf;
+        const char *buf2;
         int len;
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -1219 +1225 @@
         /* If we aren't listening to the destination name then ignore the packet */
         if (!listening(p,&dgram->dest_name)) {
-                        unexpected_packet(p);
+                        nb_packet_dispatch(packet_server, p);
                         DEBUG(5,("process_dgram: ignoring dgram packet sent to name %s from %s\n",
                                 nmb_namestr(&dgram->dest_name), inet_ntoa(p->ip)));
@@ -1226 +1232 @@
 
         if (dgram->header.msg_type != 0x10 && dgram->header.msg_type != 0x11 && dgram->header.msg_type != 0x12) {
-                unexpected_packet(p);
+                nb_packet_dispatch(packet_server, p);
                 /* Don't process error packets etc yet */
                 DEBUG(5,("process_dgram: ignoring dgram packet sent to name %s from IP %s as it is \
@@ -1312 +1318 @@
         }
 
-        unexpected_packet(p);
+        nb_packet_dispatch(packet_server, p);
 }
 
@@ -1432 +1438 @@
                         DEBUG(3,("find_subnet_for_nmb_packet: response record not found for response id %hu\n",
                                 nmb->header.name_trn_id));
-                        unexpected_packet(p);
+                        nb_packet_dispatch(packet_server, p);
                         return NULL;
                 }
@@ -1583 +1589 @@
 
         while ((p = packet_queue)) {
-                packet_queue = p->next;
-                if (packet_queue)
-                        packet_queue->prev = NULL;
-                p->next = p->prev = NULL;
+                DLIST_REMOVE(packet_queue, p);
 
                 switch (p->packet_type) {
@@ -1674 +1677 @@
 ***************************************************************************/
 
-static bool create_listen_fdset(fd_set **ppset, int **psock_array, int *listen_number, int *maxfd)
-{
-        int *sock_array = NULL;
+struct socket_attributes {
+        enum packet_type type;
+        bool broadcast;
+};
+
+static bool create_listen_pollfds(struct pollfd **pfds,
+                                  struct socket_attributes **pattrs,
+                                  int *pnum_sockets)
+{
         struct subnet_record *subrec = NULL;
         int count = 0;
         int num = 0;
-        fd_set *pset = SMB_MALLOC_P(fd_set);
-
-        if(pset == NULL) {
-                DEBUG(0,("create_listen_fdset: malloc fail !\n"));
-                return True;
-        }
-
-        /* The Client* sockets */
-        count++;
+        struct pollfd *fds;
+        struct socket_attributes *attrs;
+
+        /* The ClientNMB and ClientDGRAM sockets */
+        count = 2;
 
         /* Check that we can add all the fd's we need. */
-        for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec))
-                count++;
-
-        /* each interface gets 4 sockets */
-        count *= 4;
-
-        if(count >= FD_SETSIZE) {
-                DEBUG(0,("create_listen_fdset: Too many file descriptors needed (%d). We can \
-only use %d.\n", count, FD_SETSIZE));
-                SAFE_FREE(pset);
-                return True;
-        }
-
-        if((sock_array = SMB_MALLOC_ARRAY(int, count)) == NULL) {
-                DEBUG(0,("create_listen_fdset: malloc fail for socket array. size %d\n", count));
-                SAFE_FREE(pset);
-                return True;
-        }
-
-        FD_ZERO(pset);
-
-        /* Add in the lp_socket_address() interface on 137. */
-        if (ClientNMB < 0 || ClientNMB >= FD_SETSIZE) {
-                errno = EBADF;
-                SAFE_FREE(pset);
-                return True;
-        }
-
-        FD_SET(ClientNMB,pset);
-        sock_array[num++] = ClientNMB;
-        *maxfd = MAX( *maxfd, ClientNMB);
-
-        /* the lp_socket_address() interface has only one socket */
-        sock_array[num++] = -1;
-
-        /* Add in the 137 sockets on all the interfaces. */
+        for (subrec = FIRST_SUBNET;
+             subrec != NULL;
+             subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
+                count += 2;     /* nmb_sock and dgram_sock */
+                if (subrec->nmb_bcast != -1) {
+                        count += 1;
+                }
+                if (subrec->dgram_bcast != -1) {
+                        count += 1;
+                }
+        }
+
+        fds = TALLOC_ZERO_ARRAY(NULL, struct pollfd, count);
+        if (fds == NULL) {
+                DEBUG(1, ("create_listen_pollfds: malloc fail for fds. "
+                          "size %d\n", count));
+                return true;
+        }
+
+        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);
+                return true;
+        }
+
+        num = 0;
+
+        fds[num].fd = ClientNMB;
+        attrs[num].type = NMB_PACKET;
+        attrs[num].broadcast = false;
+        num += 1;
+
+        fds[num].fd = ClientDGRAM;
+        attrs[num].type = DGRAM_PACKET;
+        attrs[num].broadcast = false;
+        num += 1;
+
         for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
-                if (subrec->nmb_sock < 0 || subrec->nmb_sock >= FD_SETSIZE) {
-                        /* We have to ignore sockets outside FD_SETSIZE. */
-                        sock_array[num++] = -1;
-                } else {
-                        FD_SET(subrec->nmb_sock,pset);
-                        sock_array[num++] = subrec->nmb_sock;
-                        *maxfd = MAX( *maxfd, subrec->nmb_sock);
-                }
-
-                if (subrec->nmb_bcast < 0 || subrec->nmb_bcast >= FD_SETSIZE) {
-                        /* We have to ignore sockets outside FD_SETSIZE. */
-                        sock_array[num++] = -1;
-                } else {
-                        sock_array[num++] = subrec->nmb_bcast;
-                        if (subrec->nmb_bcast != -1) {
-                                FD_SET(subrec->nmb_bcast,pset);
-                                *maxfd = MAX( *maxfd, subrec->nmb_bcast);
-                        }
-                }
-        }
-
-        /* Add in the lp_socket_address() interface on 138. */
-        if (ClientDGRAM < 0 || ClientDGRAM >= FD_SETSIZE) {
-                errno = EBADF;
-                SAFE_FREE(pset);
-                return True;
-        }
-        FD_SET(ClientDGRAM,pset);
-        sock_array[num++] = ClientDGRAM;
-        *maxfd = MAX( *maxfd, ClientDGRAM);
-
-        /* the lp_socket_address() interface has only one socket */
-        sock_array[num++] = -1;
-
-        /* Add in the 138 sockets on all the interfaces. */
-        for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
-                if (subrec->dgram_sock < 0 || subrec->dgram_sock >= FD_SETSIZE) {
-                        /* We have to ignore sockets outside FD_SETSIZE. */
-                        sock_array[num++] = -1;
-                } else {
-                        FD_SET(subrec->dgram_sock,pset);
-                        sock_array[num++] = subrec->dgram_sock;
-                        *maxfd = MAX( *maxfd, subrec->dgram_sock);
-                }
-
-                if (subrec->dgram_bcast < 0 || subrec->dgram_bcast >= FD_SETSIZE) {
-                        /* We have to ignore sockets outside FD_SETSIZE. */
-                        sock_array[num++] = -1;
-                } else {
-                        sock_array[num++] = subrec->dgram_bcast;
-                        if (subrec->dgram_bcast != -1) {
-                                FD_SET(subrec->dgram_bcast,pset);
-                                *maxfd = MAX( *maxfd, subrec->dgram_bcast);
-                        }
-                }
-        }
-
-        SMB_ASSERT(count == num);
-
-        *listen_number = count;
-
-        SAFE_FREE(*ppset);
-        SAFE_FREE(*psock_array);
-
-        *ppset = pset;
-        *psock_array = sock_array;
+
+                fds[num].fd = subrec->nmb_sock;
+                attrs[num].type = NMB_PACKET;
+                attrs[num].broadcast = false;
+                num += 1;
+
+                if (subrec->nmb_bcast != -1) {
+                        fds[num].fd = subrec->nmb_bcast;
+                        attrs[num].type = NMB_PACKET;
+                        attrs[num].broadcast = true;
+                        num += 1;
+                }
+
+                fds[num].fd = subrec->dgram_sock;
+                attrs[num].type = DGRAM_PACKET;
+                attrs[num].broadcast = false;
+                num += 1;
+
+                if (subrec->dgram_bcast != -1) {
+                        fds[num].fd = subrec->dgram_bcast;
+                        attrs[num].type = DGRAM_PACKET;
+                        attrs[num].broadcast = true;
+                        num += 1;
+                }
+        }
+
+        TALLOC_FREE(*pfds);
+        *pfds = fds;
+
+        TALLOC_FREE(*pattrs);
+        *pattrs = attrs;
+
+        *pnum_sockets = count;
 
         return False;
@@ -1853 +1828 @@
                 p->packet_id = packet->packet.dgram.header.dgm_id;
         } else {
+                SAFE_FREE(p);
                 return false;
         }
@@ -1882 +1858 @@
 bool listen_for_packets(bool run_election)
 {
-        static fd_set *listen_set = NULL;
+        static struct pollfd *fds = NULL;
+        static struct socket_attributes *attrs = NULL;
         static int listen_number = 0;
-        static int *sock_array = NULL;
+        int num_sockets;
         int i;
-        static int maxfd = 0;
-
-        fd_set r_fds;
-        fd_set w_fds;
-        int selrtn;
-        struct timeval timeout;
+
+        int pollrtn;
+        int timeout;
 #ifndef SYNC_DNS
         int dns_fd;
+        int dns_pollidx = -1;
 #endif
         struct processed_packet *processed_packet_list = NULL;
 
-        if(listen_set == NULL || rescan_listen_set) {
-                if(create_listen_fdset(&listen_set, &sock_array, &listen_number, &maxfd)) {
+        if ((fds == NULL) || rescan_listen_set) {
+                if (create_listen_pollfds(&fds, &attrs, &listen_number)) {
                         DEBUG(0,("listen_for_packets: Fatal error. unable to create listen set. Exiting.\n"));
                         return True;
@@ -1905 +1880 @@
         }
 
-        memcpy((char *)&r_fds, (char *)listen_set, sizeof(fd_set));
-        FD_ZERO(&w_fds);
+        /*
+         * "fds" can be enlarged by event_add_to_poll_args
+         * below. Shrink it again to what was given to us by
+         * create_listen_pollfds.
+         */
+
+        fds = TALLOC_REALLOC_ARRAY(NULL, fds, struct pollfd, listen_number);
+        if (fds == NULL) {
+                return true;
+        }
+        num_sockets = listen_number;
 
 #ifndef SYNC_DNS
         dns_fd = asyncdns_fd();
-        if (dns_fd >= 0 && dns_fd < FD_SETSIZE) {
-                FD_SET(dns_fd, &r_fds);
-                maxfd = MAX( maxfd, dns_fd);
+        if (dns_fd != -1) {
+                fds = TALLOC_REALLOC_ARRAY(NULL, fds, struct pollfd, num_sockets+1);
+                if (fds == NULL) {
+                        return true;
+                }
+                dns_pollidx = num_sockets;
+                fds[num_sockets].fd = dns_fd;
+                num_sockets += 1;
         }
 #endif
 
+        for (i=0; i<num_sockets; i++) {
+                fds[i].events = POLLIN|POLLHUP;
+        }
+
         /* Process a signal and timer events now... */
-        if (run_events(nmbd_event_context(), 0, NULL, NULL)) {
+        if (run_events_poll(nmbd_event_context(), 0, NULL, 0)) {
                 return False;
         }
@@ -1928 +1921 @@
          */
 
-        timeout.tv_sec = (run_election||num_response_packets) ? 1 : NMBD_SELECT_LOOP;
-        timeout.tv_usec = 0;
-
-        {
-                struct timeval now = timeval_current();
-                event_add_to_select_args(nmbd_event_context(), &now,
-                                         &r_fds, &w_fds, &timeout, &maxfd);
-        }
-
-        selrtn = sys_select(maxfd+1,&r_fds,&w_fds,NULL,&timeout);
-
-        if (run_events(nmbd_event_context(), selrtn, &r_fds, &w_fds)) {
+        timeout = ((run_election||num_response_packets)
+                   ? 1 : NMBD_SELECT_LOOP) * 1000;
+
+        event_add_to_poll_args(nmbd_event_context(), NULL,
+                               &fds, &num_sockets, &timeout);
+
+        pollrtn = sys_poll(fds, num_sockets, timeout);
+
+        if (run_events_poll(nmbd_event_context(), pollrtn, fds, num_sockets)) {
                 return False;
         }
 
-        if (selrtn == -1) {
+        if (pollrtn == -1) {
                 return False;
         }
 
 #ifndef SYNC_DNS
-        if (dns_fd != -1 && FD_ISSET(dns_fd,&r_fds)) {
+        if ((dns_fd != -1) && (dns_pollidx != -1) &&
+            (fds[dns_pollidx].revents & (POLLIN|POLLHUP|POLLERR))) {
                 run_dns_queue();
         }
@@ -1960 +1951 @@
                 int client_port;
 
-                if (sock_array[i] == -1) {
+                if ((fds[i].revents & (POLLIN|POLLHUP|POLLERR)) == 0) {
                         continue;
                 }
 
-                if (!FD_ISSET(sock_array[i],&r_fds)) {
-                        continue;
-                }
-
-                if (i < (listen_number/2)) {
+                if (attrs[i].type == NMB_PACKET) {
                         /* Port 137 */
                         packet_type = NMB_PACKET;
@@ -1982 +1969 @@
                 }
 
-                packet = read_packet(sock_array[i], packet_type);
+                packet = read_packet(fds[i].fd, packet_type);
                 if (!packet) {
                         continue;
@@ -1992 +1979 @@
                  */
                 if (lp_bind_interfaces_only() &&
-                    (sock_array[i] == client_fd) &&
+                    (fds[i].fd == client_fd) &&
                     (!is_local_net_v4(packet->ip))) {
                         DEBUG(7,("discarding %s packet sent to broadcast socket from %s:%d\n",
@@ -2018 +2005 @@
                 }
 
-
                 if (is_processed_packet(processed_packet_list, packet)) {
                         DEBUG(7,("discarding duplicate packet from %s:%d\n",
@@ -2028 +2014 @@
                 store_processed_packet(&processed_packet_list, packet);
 
-                /*
-                 * 0,2,4,... are unicast sockets
-                 * 1,3,5,... are broadcast sockets
-                 *
-                 * on broadcast socket we only receive packets
-                 * and send replies via the unicast socket.
-                 *
-                 * 0,1 and 2,3 and ... belong together.
-                 */
-                if ((i % 2) != 0) {
+                if (attrs[i].broadcast) {
                         /* this is a broadcast socket */
-                        packet->send_fd = sock_array[i-1];
+                        packet->send_fd = fds[i-1].fd;
                 } else {
                         /* this is already a unicast socket */
-                        packet->send_fd = sock_array[i];
+                        packet->send_fd = fds[i].fd;
                 }
 

trunk/server/source3/nmbd/nmbd_processlogon.c

@@ -1 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    NBT netbios routines and daemon - version 2
@@ -6 +6 @@
    Copyright (C) Jeremy Allison 1994-2003
    Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2002
-   
+
    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/>.
-   
+
    Revision History:
 
@@ -25 +25 @@
 
 #include "includes.h"
-#include "../libcli/netlogon.h"
+#include "../libcli/netlogon/netlogon.h"
 #include "../libcli/cldap/cldap.h"
 #include "../lib/tsocket/tsocket.h"
+#include "../libcli/security/security.h"
+#include "secrets.h"
+#include "nmbd/nmbd.h"
 
 struct sam_database_info {
@@ -184 +187 @@
 
         ndr_err = ndr_pull_struct_blob(
-                &blob, state, NULL, &state->req,
+                &blob, state, &state->req,
                 (ndr_pull_flags_fn_t)ndr_pull_nbt_netlogon_packet);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -270 +273 @@
         DATA_BLOB response = data_blob_null;
 
-        status = cldap_netlogon_recv(subreq, NULL, state, &state->io);
+        status = cldap_netlogon_recv(subreq, state, &state->io);
         if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0,("failed to recv cldap netlogon call: %s\n",
@@ -278 +281 @@
         }
 
-        status = push_netlogon_samlogon_response(&response, state, NULL,
+        status = push_netlogon_samlogon_response(&response, state,
                                                  &state->io.out.netlogon);
         if (!NT_STATUS_IS_OK(status)) {
@@ -302 +305 @@
 **************************************************************************/
 
-void process_logon_packet(struct packet_struct *p, char *buf,int len, 
+void process_logon_packet(struct packet_struct *p, const char *buf,int len,
                           const char *mailslot)
 {
+        fstring source_name;
         struct dgram_packet *dgram = &p->packet.dgram;
-        fstring my_name;
-        fstring reply_name;
-        char outbuf[1024];
-        int code;
-        uint16 token = 0;
-        uint32 ntversion = 0;
-        uint16 lmnttoken = 0;
-        uint16 lm20token = 0;
-        uint32 domainsidsize;
-        bool short_request = False;
-        char *getdc;
-        char *uniuser; /* Unicode user name. */
-        fstring ascuser;
-        char *unicomp; /* Unicode computer name. */
-        size_t size;
         struct sockaddr_storage ss;
         const struct sockaddr_storage *pss;
         struct in_addr ip;
+
+        DATA_BLOB blob_in, blob_out;
+        enum ndr_err_code ndr_err;
+        struct nbt_netlogon_packet request;
+        struct nbt_netlogon_response response;
+        NTSTATUS status;
+        const char *pdc_name;
 
         in_addr_to_sockaddr_storage(&ss, p->ip);
@@ -335 +331 @@
         ip = ((struct sockaddr_in *)pss)->sin_addr;
 
-        memset(outbuf, 0, sizeof(outbuf));
-
         if (!lp_domain_logons()) {
                 DEBUG(5,("process_logon_packet: Logon packet received from IP %s and domain \
@@ -343 +337 @@
         }
 
-        fstrcpy(my_name, global_myname());
-
-        code = get_safe_SVAL(buf,len,buf,0,-1);
-        DEBUG(4,("process_logon_packet: Logon from %s: code = 0x%x\n", inet_ntoa(p->ip), code));
-
-        switch (code) {
-                case 0:
-                        {
-                                fstring mach_str, user_str, getdc_str;
-                                char *q = buf + 2;
-                                char *machine = q;
-                                char *user = skip_string(buf,len,machine);
-
-                                if (!user || PTR_DIFF(user, buf) >= len) {
-                                        DEBUG(0,("process_logon_packet: bad packet\n"));
-                                        return;
-                                }
-                                getdc = skip_string(buf,len,user);
-
-                                if (!getdc || PTR_DIFF(getdc, buf) >= len) {
-                                        DEBUG(0,("process_logon_packet: bad packet\n"));
-                                        return;
-                                }
-                                q = skip_string(buf,len,getdc);
-
-                                if (!q || PTR_DIFF(q + 5, buf) > len) {
-                                        DEBUG(0,("process_logon_packet: bad packet\n"));
-                                        return;
-                                }
-                                token = SVAL(q,3);
-
-                                fstrcpy(reply_name,my_name);
-
-                                pull_ascii_fstring(mach_str, machine);
-                                pull_ascii_fstring(user_str, user);
-                                pull_ascii_fstring(getdc_str, getdc);
-
-                                DEBUG(5,("process_logon_packet: Domain login request from %s at IP %s user=%s token=%x\n",
-                                        mach_str,inet_ntoa(p->ip),user_str,token));
-
-                                q = outbuf;
-                                SSVAL(q, 0, 6);
-                                q += 2;
-
-                                fstrcpy(reply_name, "\\\\");
-                                fstrcat(reply_name, my_name);
-                                size = push_ascii(q,reply_name,
-                                                sizeof(outbuf)-PTR_DIFF(q, outbuf),
-                                                STR_TERMINATE);
-                                if (size == (size_t)-1) {
-                                        return;
-                                }
-                                q = skip_string(outbuf,sizeof(outbuf),q); /* PDC name */
-
-                                SSVAL(q, 0, token);
-                                q += 2;
-
-                                dump_data(4, (uint8 *)outbuf, PTR_DIFF(q, outbuf));
-
-                                send_mailslot(True, getdc_str,
-                                                outbuf,PTR_DIFF(q,outbuf),
-                                                global_myname(), 0x0,
-                                                mach_str,
-                                                dgram->source_name.name_type,
-                                                p->ip, ip, p->port);
-                                break;
+        pull_ascii_nstring(source_name, sizeof(source_name), dgram->source_name.name);
+
+        pdc_name = talloc_asprintf(talloc_tos(), "\\\\%s", global_myname());
+        if (!pdc_name) {
+                return;
+        }
+
+        ZERO_STRUCT(request);
+
+        blob_in = data_blob_const(buf, len);
+
+        ndr_err = ndr_pull_struct_blob(&blob_in, talloc_tos(), &request,
+                (ndr_pull_flags_fn_t)ndr_pull_nbt_netlogon_packet);
+        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                DEBUG(1,("process_logon_packet: Failed to pull logon packet\n"));
+                return;
+        }
+
+        if (DEBUGLEVEL >= 10) {
+                NDR_PRINT_DEBUG(nbt_netlogon_packet, &request);
+        }
+
+        DEBUG(4,("process_logon_packet: Logon from %s: code = 0x%x\n",
+                inet_ntoa(p->ip), request.command));
+
+        switch (request.command) {
+        case LOGON_REQUEST: {
+
+                struct nbt_netlogon_response2 response2;
+
+                DEBUG(5,("process_logon_packet: Domain login request from %s at IP %s user=%s token=%x\n",
+                        request.req.logon0.computer_name, inet_ntoa(p->ip),
+                        request.req.logon0.user_name,
+                        request.req.logon0.lm20_token));
+
+                response2.command       = LOGON_RESPONSE2;
+                response2.pdc_name      = pdc_name;
+                response2.lm20_token    = 0xffff;
+
+                response.response_type = NETLOGON_RESPONSE2;
+                response.data.response2 = response2;
+
+                status = push_nbt_netlogon_response(&blob_out, talloc_tos(), &response);
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(0,("process_logon_packet: failed to push packet\n"));
+                        return;
+                }
+
+                if (DEBUGLEVEL >= 10) {
+                        NDR_PRINT_DEBUG(nbt_netlogon_response2, &response.data.response2);
+                }
+
+                send_mailslot(True, request.req.logon0.mailslot_name,
+                                (char *)blob_out.data,
+                                blob_out.length,
+                                global_myname(), 0x0,
+                                source_name,
+                                dgram->source_name.name_type,
+                                p->ip, ip, p->port);
+                break;
+        }
+
+        case LOGON_PRIMARY_QUERY: {
+
+                struct nbt_netlogon_response_from_pdc get_pdc;
+
+                if (!lp_domain_master()) {
+                        /* We're not Primary Domain Controller -- ignore this */
+                        return;
+                }
+
+                DEBUG(5,("process_logon_packet: GETDC request from %s at IP %s, "
+                        "reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
+                        request.req.pdc.computer_name,
+                        inet_ntoa(p->ip),
+                        global_myname(),
+                        lp_workgroup(),
+                        NETLOGON_RESPONSE_FROM_PDC,
+                        request.req.pdc.nt_version,
+                        request.req.pdc.lmnt_token,
+                        request.req.pdc.lm20_token));
+
+                get_pdc.command                 = NETLOGON_RESPONSE_FROM_PDC;
+                get_pdc.pdc_name                = global_myname();
+                get_pdc._pad                    = data_blob_null;
+                get_pdc.unicode_pdc_name        = global_myname();
+                get_pdc.domain_name             = lp_workgroup();
+                get_pdc.nt_version              = NETLOGON_NT_VERSION_1;
+                get_pdc.lmnt_token              = 0xffff;
+                get_pdc.lm20_token              = 0xffff;
+
+                response.response_type = NETLOGON_GET_PDC;
+                response.data.get_pdc = get_pdc;
+
+                status = push_nbt_netlogon_response(&blob_out, talloc_tos(), &response);
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(0,("process_logon_packet: failed to push packet\n"));
+                        return;
+                }
+
+                if (DEBUGLEVEL >= 10) {
+                        NDR_PRINT_DEBUG(nbt_netlogon_response_from_pdc, &response.data.get_pdc);
+                }
+
+                send_mailslot(True, request.req.pdc.mailslot_name,
+                        (char *)blob_out.data,
+                        blob_out.length,
+                        global_myname(), 0x0,
+                        source_name,
+                        dgram->source_name.name_type,
+                        p->ip, ip, p->port);
+
+                return;
+        }
+
+        case LOGON_SAM_LOGON_REQUEST: {
+                char *source_addr;
+                bool user_unknown = false;
+
+                struct netlogon_samlogon_response samlogon;
+
+                if (global_nmbd_proxy_logon) {
+                        nmbd_proxy_logon(global_nmbd_proxy_logon,
+                                         ip, p, (uint8_t *)buf, len);
+                        return;
+                }
+
+                source_addr = SMB_STRDUP(inet_ntoa(dgram->header.source_ip));
+                if (source_addr == NULL) {
+                        DEBUG(3, ("out of memory copying client"
+                                  " address string\n"));
+                        return;
+                }
+
+                DEBUG(5,("process_logon_packet: LOGON_SAM_LOGON_REQUEST request from %s(%s) for %s, returning logon svr %s domain %s code %x token=%x\n",
+                        request.req.logon.computer_name,
+                        inet_ntoa(p->ip),
+                        request.req.logon.user_name,
+                        pdc_name,
+                        lp_workgroup(),
+                        LOGON_SAM_LOGON_RESPONSE,
+                        request.req.logon.lmnt_token));
+
+                if (!request.req.logon.user_name) {
+                        user_unknown = true;
+                }
+
+                /* 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);
                         }
-
-                case LOGON_PRIMARY_QUERY:
-                        {
-                                fstring mach_str, getdc_str;
-                                fstring source_name;
-                                char *q = buf + 2;
-                                char *machine = q;
-
-                                if (!lp_domain_master()) {
-                                        /* We're not Primary Domain Controller -- ignore this */
-                                        return;
-                                }
-
-                                getdc = skip_string(buf,len,machine);
-
-                                if (!getdc || PTR_DIFF(getdc, buf) >= len) {
-                                        DEBUG(0,("process_logon_packet: bad packet\n"));
-                                        return;
-                                }
-                                q = skip_string(buf,len,getdc);
-
-                                if (!q || PTR_DIFF(q, buf) >= len) {
-                                        DEBUG(0,("process_logon_packet: bad packet\n"));
-                                        return;
-                                }
-                                q = ALIGN2(q, buf);
-
-                                /* At this point we can work out if this is a W9X or NT style
-                                   request. Experiments show that the difference is wether the
-                                   packet ends here. For a W9X request we now end with a pair of
-                                   bytes (usually 0xFE 0xFF) whereas with NT we have two further
-                                   strings - the following is a simple way of detecting this */
-
-                                if (len - PTR_DIFF(q, buf) <= 3) {
-                                        short_request = True;
-                                } else {
-                                        unicomp = q;
-
-                                        if (PTR_DIFF(q, buf) >= len) {
-                                                DEBUG(0,("process_logon_packet: bad packet\n"));
-                                                return;
-                                        }
-
-                                        /* A full length (NT style) request */
-                                        q = skip_unibuf(unicomp, PTR_DIFF(buf + len, unicomp));
-
-                                        if (PTR_DIFF(q, buf) >= len) {
-                                                DEBUG(0,("process_logon_packet: bad packet\n"));
-                                                return;
-                                        }
-
-                                        if (len - PTR_DIFF(q, buf) > 8) {
-                                                /* with NT5 clients we can sometimes
-                                                        get additional data - a length specificed string
-                                                        containing the domain name, then 16 bytes of
-                                                        data (no idea what it is) */
-                                                int dom_len = CVAL(q, 0);
-                                                q++;
-                                                if (dom_len != 0) {
-                                                        q += dom_len + 1;
-                                                }
-                                                q += 16;
-                                        }
-
-                                        if (PTR_DIFF(q + 8, buf) > len) {
-                                                DEBUG(0,("process_logon_packet: bad packet\n"));
-                                                return;
-                                        }
-
-                                        ntversion = IVAL(q, 0);
-                                        lmnttoken = SVAL(q, 4);
-                                        lm20token = SVAL(q, 6);
-                                }
-
-                                /* Construct reply. */
-                                q = outbuf;
-                                SSVAL(q, 0, NETLOGON_RESPONSE_FROM_PDC);
-                                q += 2;
-
-                                fstrcpy(reply_name,my_name);
-                                size = push_ascii(q, reply_name,
-                                                sizeof(outbuf)-PTR_DIFF(q, outbuf),
-                                                STR_TERMINATE);
-                                if (size == (size_t)-1) {
-                                        return;
-                                }
-                                q = skip_string(outbuf,sizeof(outbuf),q); /* PDC name */
-
-                                /* PDC and domain name */
-                                if (!short_request) {
-                                        /* Make a full reply */
-                                        q = ALIGN2(q, outbuf);
-
-                                        q += dos_PutUniCode(q, my_name,
-                                                sizeof(outbuf) - PTR_DIFF(q, outbuf),
-                                                True); /* PDC name */
-                                        q += dos_PutUniCode(q, lp_workgroup(),
-                                                sizeof(outbuf) - PTR_DIFF(q, outbuf),
-                                                True); /* Domain name*/
-                                        if (sizeof(outbuf) - PTR_DIFF(q, outbuf) < 8) {
-                                                return;
-                                        }
-                                        SIVAL(q, 0, 1); /* our nt version */
-                                        SSVAL(q, 4, 0xffff); /* our lmnttoken */
-                                        SSVAL(q, 6, 0xffff); /* our lm20token */
-                                        q += 8;
-                                }
-
-                                /* RJS, 21-Feb-2000, we send a short reply if the request was short */
-
-                                pull_ascii_fstring(mach_str, machine);
-
-                                DEBUG(5,("process_logon_packet: GETDC request from %s at IP %s, \
-reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
-                                        mach_str,inet_ntoa(p->ip), reply_name, lp_workgroup(),
-                                        NETLOGON_RESPONSE_FROM_PDC, (uint32)ntversion, (uint32)lmnttoken,
-                                        (uint32)lm20token ));
-
-                                dump_data(4, (uint8 *)outbuf, PTR_DIFF(q, outbuf));
-
-                                pull_ascii_fstring(getdc_str, getdc);
-                                pull_ascii_nstring(source_name, sizeof(source_name), dgram->source_name.name);
-
-                                send_mailslot(True, getdc_str,
-                                        outbuf,PTR_DIFF(q,outbuf),
-                                        global_myname(), 0x0,
-                                        source_name,
-                                        dgram->source_name.name_type,
-                                        p->ip, ip, p->port);
+                }
+#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;
                         }
 
-                case LOGON_SAM_LOGON_REQUEST:
-
-                        {
-                                fstring getdc_str;
-                                fstring source_name;
-                                char *source_addr;
-                                char *q = buf + 2;
-                                fstring asccomp;
-
-                                if (global_nmbd_proxy_logon) {
-                                        nmbd_proxy_logon(global_nmbd_proxy_logon,
-                                                         ip, p, (uint8_t *)buf, len);
-                                        return;
-                                }
-
-                                q += 2;
-
-                                if (PTR_DIFF(q, buf) >= len) {
-                                        DEBUG(0,("process_logon_packet: bad packet\n"));
-                                        return;
-                                }
-
-                                unicomp = q;
-                                uniuser = skip_unibuf(unicomp, PTR_DIFF(buf+len, unicomp));
-
-                                if (PTR_DIFF(uniuser, buf) >= len) {
-                                        DEBUG(0,("process_logon_packet: bad packet\n"));
-                                        return;
-                                }
-
-                                getdc = skip_unibuf(uniuser,PTR_DIFF(buf+len, uniuser));
-
-                                if (PTR_DIFF(getdc, buf) >= len) {
-                                        DEBUG(0,("process_logon_packet: bad packet\n"));
-                                        return;
-                                }
-
-                                q = skip_string(buf,len,getdc);
-
-                                if (!q || PTR_DIFF(q + 8, buf) >= len) {
-                                        DEBUG(0,("process_logon_packet: bad packet\n"));
-                                        return;
-                                }
-
-                                q += 4; /* Account Control Bits - indicating username type */
-                                domainsidsize = IVAL(q, 0);
-                                q += 4;
-
-                                DEBUG(5,("process_logon_packet: LOGON_SAM_LOGON_REQUEST sidsize %d, len = %d\n", domainsidsize, len));
-
-                                if (domainsidsize < (len - PTR_DIFF(q, buf)) && (domainsidsize != 0)) {
-                                        q += domainsidsize;
-                                        q = ALIGN4(q, buf);
-                                }
-
-                                DEBUG(5,("process_logon_packet: len = %d PTR_DIFF(q, buf) = %ld\n", len, (unsigned long)PTR_DIFF(q, buf) ));
-
-                                if (len - PTR_DIFF(q, buf) > 8) {
-                                        /* with NT5 clients we can sometimes
-                                                get additional data - a length specificed string
-                                                containing the domain name, then 16 bytes of
-                                                data (no idea what it is) */
-                                        int dom_len = CVAL(q, 0);
-                                        q++;
-                                        if (dom_len < (len - PTR_DIFF(q, buf)) && (dom_len != 0)) {
-                                                q += dom_len + 1;
-                                        }
-                                        q += 16;
-                                }
-
-                                if (PTR_DIFF(q + 8, buf) > len) {
-                                        DEBUG(0,("process_logon_packet: bad packet\n"));
-                                        return;
-                                }
-
-                                ntversion = IVAL(q, 0);
-                                lmnttoken = SVAL(q, 4);
-                                lm20token = SVAL(q, 6);
-                                q += 8;
-
-                                DEBUG(3,("process_logon_packet: LOGON_SAM_LOGON_REQUEST sidsize %d ntv %d\n", domainsidsize, ntversion));
-
-                                /*
-                                 * we respond regadless of whether the machine is in our password 
-                                 * database. If it isn't then we let smbd send an appropriate error.
-                                 * Let's ignore the SID.
-                                 */
-                                pull_ucs2_fstring(ascuser, uniuser);
-                                pull_ucs2_fstring(asccomp, unicomp);
-                                DEBUG(5,("process_logon_packet: LOGON_SAM_LOGON_REQUEST user %s\n", ascuser));
-
-                                fstrcpy(reply_name, "\\\\"); /* Here it wants \\LOGONSERVER. */
-                                fstrcat(reply_name, my_name);
-
-                                DEBUG(5,("process_logon_packet: LOGON_SAM_LOGON_REQUEST request from %s(%s) for %s, returning logon svr %s domain %s code %x token=%x\n",
-                                        asccomp,inet_ntoa(p->ip), ascuser, reply_name, lp_workgroup(),
-                                LOGON_SAM_LOGON_RESPONSE ,lmnttoken));
-
-                                /* Construct reply. */
-
-                                q = outbuf;
-                                /* we want the simple version unless we are an ADS PDC..which means  */
-                                /* never, at least for now */
-                                if ((ntversion < 11) || (SEC_ADS != lp_security()) || (ROLE_DOMAIN_PDC != lp_server_role())) {
-                                        if (SVAL(uniuser, 0) == 0) {
-                                                SSVAL(q, 0, LOGON_SAM_LOGON_USER_UNKNOWN);      /* user unknown */
-                                        } else {
-                                                SSVAL(q, 0, LOGON_SAM_LOGON_RESPONSE);
-                                        }
-
-                                        q += 2;
-
-                                        q += dos_PutUniCode(q, reply_name,
-                                                sizeof(outbuf) - PTR_DIFF(q, outbuf),
-                                                True);
-                                        q += dos_PutUniCode(q, ascuser,
-                                                sizeof(outbuf) - PTR_DIFF(q, outbuf),
-                                                True);
-                                        q += dos_PutUniCode(q, lp_workgroup(),
-                                                sizeof(outbuf) - PTR_DIFF(q, outbuf),
-                                                True);
-                                }
-#ifdef HAVE_ADS
-                                else {
-                                        struct GUID domain_guid;
-                                        UUID_FLAT flat_guid;
-                                        char *domain;
-                                        char *hostname;
-                                        char *component, *dc, *q1;
-                                        char *q_orig = q;
-                                        int str_offset;
-                                        char *saveptr = NULL;
-
-                                        domain = get_mydnsdomname(talloc_tos());
-                                        if (!domain) {
-                                                DEBUG(2,
-                                                ("get_mydnsdomname failed.\n"));
-                                                return;
-                                        }
-                                        hostname = get_myname(talloc_tos());
-                                        if (!hostname) {
-                                                DEBUG(2,
-                                                ("get_myname failed.\n"));
-                                                return;
-                                        }
-
-                                        if (sizeof(outbuf) - PTR_DIFF(q, outbuf) < 8) {
-                                                return;
-                                        }
-                                        if (SVAL(uniuser, 0) == 0) {
-                                                SIVAL(q, 0, LOGON_SAM_LOGON_USER_UNKNOWN_EX);   /* user unknown */
-                                        } else {
-                                                SIVAL(q, 0, LOGON_SAM_LOGON_RESPONSE_EX);
-                                        }
-                                        q += 4;
-
-                                        SIVAL(q, 0, NBT_SERVER_PDC|NBT_SERVER_GC|NBT_SERVER_LDAP|NBT_SERVER_DS|
-                                                NBT_SERVER_KDC|NBT_SERVER_TIMESERV|NBT_SERVER_CLOSEST|NBT_SERVER_WRITABLE);
-                                        q += 4;
-
-                                        /* Push Domain GUID */
-                                        if (sizeof(outbuf) - PTR_DIFF(q, outbuf) < UUID_FLAT_SIZE) {
-                                                return;
-                                        }
-                                        if (False == secrets_fetch_domain_guid(domain, &domain_guid)) {
-                                                DEBUG(2, ("Could not fetch DomainGUID for %s\n", domain));
-                                                return;
-                                        }
-
-                                        smb_uuid_pack(domain_guid, &flat_guid);
-                                        memcpy(q, &flat_guid.info, UUID_FLAT_SIZE);
-                                        q += UUID_FLAT_SIZE;
-
-                                        /* Forest */
-                                        str_offset = q - q_orig;
-                                        dc = domain;
-                                        q1 = q;
-                                        while ((component = strtok_r(dc, ".", &saveptr)) != NULL) {
-                                                dc = NULL;
-                                                if (sizeof(outbuf) - PTR_DIFF(q, outbuf) < 1) {
-                                                        return;
-                                                }
-                                                size = push_ascii(&q[1], component,
-                                                        sizeof(outbuf) - PTR_DIFF(q+1, outbuf),
-                                                        0);
-                                                if (size == (size_t)-1 || size > 0xff) {
-                                                        return;
-                                                }
-                                                SCVAL(q, 0, size);
-                                                q += (size + 1);
-                                        }
-
-                                        /* Unk0 */
-                                        if (sizeof(outbuf) - PTR_DIFF(q, outbuf) < 4) {
-                                                return;
-                                        }
-                                        SCVAL(q, 0, 0);
-                                        q++;
-
-                                        /* Domain */
-                                        SCVAL(q, 0, 0xc0 | ((str_offset >> 8) & 0x3F));
-                                        SCVAL(q, 1, str_offset & 0xFF);
-                                        q += 2;
-
-                                        /* Hostname */
-                                        size = push_ascii(&q[1], hostname,
-                                                        sizeof(outbuf) - PTR_DIFF(q+1, outbuf),
-                                                        0);
-                                        if (size == (size_t)-1 || size > 0xff) {
-                                                return;
-                                        }
-                                        SCVAL(q, 0, size);
-                                        q += (size + 1);
-
-                                        if (sizeof(outbuf) - PTR_DIFF(q, outbuf) < 3) {
-                                                return;
-                                        }
-
-                                        SCVAL(q, 0, 0xc0 | ((str_offset >> 8) & 0x3F));
-                                        SCVAL(q, 1, str_offset & 0xFF);
-                                        q += 2;
-
-                                        /* NETBIOS of domain */
-                                        size = push_ascii(&q[1], lp_workgroup(),
-                                                        sizeof(outbuf) - PTR_DIFF(q+1, outbuf),
-                                                        STR_UPPER);
-                                        if (size == (size_t)-1 || size > 0xff) {
-                                                return;
-                                        }
-                                        SCVAL(q, 0, size);
-                                        q += (size + 1);
-
-                                        /* Unk1 */
-                                        if (sizeof(outbuf) - PTR_DIFF(q, outbuf) < 2) {
-                                                return;
-                                        }
-
-                                        SCVAL(q, 0, 0);
-                                        q++;
-
-                                        /* NETBIOS of hostname */
-                                        size = push_ascii(&q[1], my_name,
-                                                        sizeof(outbuf) - PTR_DIFF(q+1, outbuf),
-                                                        0);
-                                        if (size == (size_t)-1 || size > 0xff) {
-                                                return;
-                                        }
-                                        SCVAL(q, 0, size);
-                                        q += (size + 1);
-
-                                        /* Unk2 */
-                                        if (sizeof(outbuf) - PTR_DIFF(q, outbuf) < 4) {
-                                                return;
-                                        }
-
-                                        SCVAL(q, 0, 0);
-                                        q++;
-
-                                        /* User name */
-                                        if (SVAL(uniuser, 0) != 0) {
-                                                size = push_ascii(&q[1], ascuser,
-                                                        sizeof(outbuf) - PTR_DIFF(q+1, outbuf),
-                                                        0);
-                                                if (size == (size_t)-1 || size > 0xff) {
-                                                        return;
-                                                }
-                                                SCVAL(q, 0, size);
-                                                q += (size + 1);
-                                        }
-
-                                        q_orig = q;
-                                        /* Site name */
-                                        if (sizeof(outbuf) - PTR_DIFF(q, outbuf) < 1) {
-                                                return;
-                                        }
-                                        size = push_ascii(&q[1], "Default-First-Site-Name",
-                                                        sizeof(outbuf) - PTR_DIFF(q+1, outbuf),
-                                                        0);
-                                        if (size == (size_t)-1 || size > 0xff) {
-                                                return;
-                                        }
-                                        SCVAL(q, 0, size);
-                                        q += (size + 1);
-
-                                        if (sizeof(outbuf) - PTR_DIFF(q, outbuf) < 18) {
-                                                return;
-                                        }
-
-                                        /* Site name (2) */
-                                        str_offset = q - q_orig;
-                                        SCVAL(q, 0, 0xc0 | ((str_offset >> 8) & 0x3F));
-                                        SCVAL(q, 1, str_offset & 0xFF);
-                                        q += 2;
-
-                                        SCVAL(q, 0, PTR_DIFF(q,q1));
-                                        SCVAL(q, 1, 0x10); /* unknown */
-
-                                        SIVAL(q, 0, 0x00000002);
-                                        q += 4; /* unknown */
-                                        SIVAL(q, 0, ntohl(ip.s_addr));
-                                        q += 4;
-                                        SIVAL(q, 0, 0x00000000);
-                                        q += 4; /* unknown */
-                                        SIVAL(q, 0, 0x00000000);
-                                        q += 4; /* unknown */
-                                }
-#endif
-
-                                if (sizeof(outbuf) - PTR_DIFF(q, outbuf) < 8) {
-                                        return;
-                                }
-
-                                /* tell the client what version we are */
-                                SIVAL(q, 0, ((ntversion < 11) || (SEC_ADS != lp_security())) ? 1 : 13); 
-                                /* our ntversion */
-                                SSVAL(q, 4, 0xffff); /* our lmnttoken */
-                                SSVAL(q, 6, 0xffff); /* our lm20token */
-                                q += 8;
-
-                                dump_data(4, (uint8 *)outbuf, PTR_DIFF(q, outbuf));
-
-                                pull_ascii_fstring(getdc_str, getdc);
-                                pull_ascii_nstring(source_name, sizeof(source_name), dgram->source_name.name);
-                                source_addr = SMB_STRDUP(inet_ntoa(dgram->header.source_ip));
-                                if (source_addr == NULL) {
-                                        DEBUG(3, ("out of memory copying client"
-                                                  " address string\n"));
-                                        return;
-                                }
-
-                                /*
-                                 * handle delay.
-                                 * packets requeued after delay are marked as
-                                 * locked.
-                                 */
-                                if ((p->locked == False) &&
-                                    (strlen(ascuser) == 0) &&
-                                    delay_logon(source_name, source_addr))
-                                {
-                                        struct timeval when;
-
-                                        DEBUG(3, ("process_logon_packet: "
-                                                  "delaying initial logon "
-                                                  "reply for client %s(%s) for "
-                                                  "%u milliseconds\n",
-                                                  source_name, source_addr,
-                                                  lp_init_logon_delay()));
-
-                                        when = timeval_current_ofs(0,
-                                                lp_init_logon_delay() * 1000);
-                                        p->locked = true;
-                                        event_add_timed(nmbd_event_context(),
-                                                        NULL,
-                                                        when,
-                                                        delayed_init_logon_handler,
-                                                        p);
-                                } else {
-                                        DEBUG(3, ("process_logon_packet: "
-                                                  "processing delayed initial "
-                                                  "logon reply for client "
-                                                  "%s(%s)\n",
-                                                  source_name, source_addr));
-
-                                        p->locked = false;
-                                        send_mailslot(true, getdc,
-                                                outbuf,PTR_DIFF(q,outbuf),
-                                                global_myname(), 0x0,
-                                                source_name,
-                                                dgram->source_name.name_type,
-                                                p->ip, ip, p->port);
-                                }
-
-                                SAFE_FREE(source_addr);
-
-                                break;
+                        hostname = get_mydnsfullname();
+                        if (!hostname) {
+                                DEBUG(2,("get_mydnsfullname failed.\n"));
+                                return;
                         }
 
-                /* Announce change to UAS or SAM.  Send by the domain controller when a
-                replication event is required. */
-
-                case NETLOGON_ANNOUNCE_UAS:
-                        DEBUG(5, ("Got NETLOGON_ANNOUNCE_UAS\n"));
-                        break;
-
-                default:
-                        DEBUG(3,("process_logon_packet: Unknown domain request %d\n",code));
+                        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 */
+
+                response.response_type = NETLOGON_SAMLOGON;
+                response.data.samlogon = samlogon;
+
+                status = push_nbt_netlogon_response(&blob_out, talloc_tos(), &response);
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(0,("process_logon_packet: failed to push packet\n"));
                         return;
+                }
+
+                /*
+                 * handle delay.
+                 * packets requeued after delay are marked as
+                 * locked.
+                 */
+                if ((p->locked == False) &&
+                    (strlen(request.req.logon.user_name) == 0) &&
+                    delay_logon(source_name, source_addr))
+                {
+                        struct timeval when;
+
+                        DEBUG(3, ("process_logon_packet: "
+                                  "delaying initial logon "
+                                  "reply for client %s(%s) for "
+                                  "%u milliseconds\n",
+                                  source_name, source_addr,
+                                  lp_init_logon_delay()));
+
+                        when = timeval_current_ofs(0,
+                                lp_init_logon_delay() * 1000);
+                        p->locked = true;
+                        event_add_timed(nmbd_event_context(),
+                                        NULL,
+                                        when,
+                                        delayed_init_logon_handler,
+                                        p);
+                } else {
+                        DEBUG(3, ("process_logon_packet: "
+                                  "processing delayed initial "
+                                  "logon reply for client "
+                                  "%s(%s)\n",
+                                  source_name, source_addr));
+                        p->locked = false;
+                        send_mailslot(true, request.req.logon.mailslot_name,
+                                (char *)blob_out.data,
+                                blob_out.length,
+                                global_myname(), 0x0,
+                                source_name,
+                                dgram->source_name.name_type,
+                                p->ip, ip, p->port);
+                }
+
+                SAFE_FREE(source_addr);
+
+                break;
+        }
+
+        /* Announce change to UAS or SAM.  Send by the domain controller when a
+        replication event is required. */
+
+        case NETLOGON_ANNOUNCE_UAS:
+                DEBUG(5, ("Got NETLOGON_ANNOUNCE_UAS\n"));
+                break;
+
+        default:
+                DEBUG(3,("process_logon_packet: Unknown domain request %d\n",
+                        request.command));
+                return;
         }
 }

trunk/server/source3/nmbd/nmbd_responserecordsdb.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
 
 int num_response_packets = 0;

trunk/server/source3/nmbd/nmbd_sendannounce.c

@@ -25 +25 @@
 
 #include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
+#include "nmbd/nmbd.h"
 
 extern int  updatecount;

trunk/server/source3/nmbd/nmbd_serverlistdb.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "../librpc/gen_ndr/svcctl.h"
+#include "nmbd/nmbd.h"
 
 int updatecount = 0;
@@ -37 +40 @@
                 DEBUG(7,("remove_all_servers: Removing server %s\n",servrec->serv.name));
                 nexts = servrec->next;
-
-                if (servrec->prev)
-                        servrec->prev->next = servrec->next;
-                if (servrec->next)
-                        servrec->next->prev = servrec->prev;
-
-                if (work->serverlist == servrec)
-                        work->serverlist = servrec->next;
-
+                DLIST_REMOVE(work->serverlist, servrec);
                 ZERO_STRUCTP(servrec);
                 SAFE_FREE(servrec);
@@ -60 +55 @@
                              struct server_record *servrec)
 {
-        struct server_record *servrec2;
-
-        if (!work->serverlist) {
-                work->serverlist = servrec;
-                servrec->prev = NULL;
-                servrec->next = NULL;
-                return;
-        }
-
-        for (servrec2 = work->serverlist; servrec2->next; servrec2 = servrec2->next)
-                ;
-
-        servrec2->next = servrec;
-        servrec->next = NULL;
-        servrec->prev = servrec2;
+        DLIST_ADD_END(work->serverlist, servrec, struct server_record *);
         work->subnet->work_changed = True;
 }
@@ -100 +81 @@
 void remove_server_from_workgroup(struct work_record *work, struct server_record *servrec)
 {
-        if (servrec->prev)
-                servrec->prev->next = servrec->next;
-        if (servrec->next)
-                servrec->next->prev = servrec->prev;
-
-        if (work->serverlist == servrec) 
-                work->serverlist = servrec->next; 
-
+        DLIST_REMOVE(work->serverlist, servrec);
         ZERO_STRUCTP(servrec);
         SAFE_FREE(servrec);

trunk/server/source3/nmbd/nmbd_subnetdb.c

@@ -24 +24 @@
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
 
 extern int global_nmb_port;
@@ -260 +261 @@
                  */
 
-                saved_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
+                saved_handler = CatchSignal(SIGTERM, SIG_DFL);
 
                 sleep(5);
@@ -269 +270 @@
                  */
 
-                CatchSignal( SIGTERM, SIGNAL_CAST saved_handler );
+                CatchSignal(SIGTERM, saved_handler);
         }
 
@@ -321 +322 @@
                                 "smb.conf correct ?\n"));
 
-                saved_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
+                saved_handler = CatchSignal(SIGTERM, SIG_DFL);
 
                 sleep(5);
                 load_interfaces();
 
-                CatchSignal( SIGTERM, SIGNAL_CAST saved_handler );
+                CatchSignal(SIGTERM, saved_handler);
                 goto try_interfaces_again;
         }

trunk/server/source3/nmbd/nmbd_synclists.c

@@ -28 +28 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "../librpc/gen_ndr/svcctl.h"
+#include "nmbd/nmbd.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/clirap.h"
+#include "smbprofile.h"
 
 struct sync_record {

trunk/server/source3/nmbd/nmbd_winsproxy.c

@@ -21 +21 @@
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
 
 /****************************************************************************

trunk/server/source3/nmbd/nmbd_winsserver.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "nmbd/nmbd.h"
+#include "util_tdb.h"
 
 #define WINS_LIST "wins.dat"
@@ -49 +52 @@
                 SAFE_FREE(nr->data.ip);
                 SAFE_FREE(nr);
+        }
+}
+
+/****************************************************************************
+ Delete all the temporary 1b name records on the in-memory linked list.
+*****************************************************************************/
+
+static void wins_delete_all_1b_in_memory_records(void)
+{
+        struct name_record *nr = NULL;
+        struct name_record *nrnext = NULL;
+
+        /* Delete all temporary 1b name records on the wins subnet linked list. */
+        for( nr = wins_server_subnet->namelist; nr; nr = nrnext) {
+                nrnext = nr->next;
+                if (nr->name.name_type == 0x1b) {
+                        DLIST_REMOVE(wins_server_subnet->namelist, nr);
+                        SAFE_FREE(nr->data.ip);
+                        SAFE_FREE(nr);
+                }
         }
 }
@@ -405 +428 @@
         namerec->data.wins_flags|=flags;
 
-        DEBUG(8,("update_wins_flag: nbflags: 0x%x, ttl: 0x%d, flags: 0x%x, winsflags: 0x%x\n", 
+        DEBUG(8,("update_wins_flag: nbflags: 0x%x, ttl: %d, flags: 0x%x, winsflags: 0x%x\n", 
                  namerec->data.nb_flags, (int)namerec->data.death_time, flags, namerec->data.wins_flags));
 }
@@ -584 +607 @@
 
         /* Open the wins.tdb. */
-        wins_tdb = tdb_open_log(state_path("wins.tdb"), 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST, O_CREAT|O_RDWR, 0600);
+        wins_tdb = tdb_open_log(state_path("wins.tdb"), 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
+                        O_CREAT|O_RDWR, 0600);
         if (!wins_tdb) {
                 DEBUG(0,("initialise_wins: failed to open wins.tdb. Error was %s\n",
@@ -1251 +1275 @@
 
                         if(!find_ip_in_name_record(namerec, from_ip)) {
+                                /*
+                                 * Need to emulate the behaviour of Windows, as
+                                 * described in:
+                                 * http://lists.samba.org/archive/samba-technical/2001-October/016236.html
+                                 * (is there an MS reference for this
+                                 * somewhere?) because if the 1c list gets over
+                                 * 86 entries, the reply packet is too big
+                                 * (rdata>576 bytes) so no reply is sent.
+                                 *
+                                 * Keep only the "latest" 25 records, while
+                                 * ensuring that the PDC (0x1b) is never removed
+                                 * We do this by removing the first entry that
+                                 * isn't the 1b entry for the same name,
+                                 * on the grounds that insertion is at the end
+                                 * of the list, so the oldest entries are at
+                                 * the start.
+                                 *
+                                 */
+                                while(namerec->data.num_ips>=25) {
+                                        struct name_record *name1brec = NULL;
+
+                                        /* We only do this for 1c types. */
+                                        if (namerec->name.name_type != 0x1c) {
+                                                break;
+                                        }
+                                        DEBUG(3,("wins_process_name_registration_request: "
+                                                "More than 25 IPs already in "
+                                                "the list. Looking for a 1b "
+                                                "record\n"));
+
+                                        /* Ensure we have all the active 1b
+                                         * names on the list. */
+                                        wins_delete_all_1b_in_memory_records();
+                                        fetch_all_active_wins_1b_names();
+
+                                        /* Per the above, find the 1b record,
+                                           and then remove the first IP that isn't the same */
+                                        for(name1brec = subrec->namelist;
+                                                        name1brec;
+                                                        name1brec = name1brec->next ) {
+                                                if( WINS_STATE_ACTIVE(name1brec) &&
+                                                                name1brec->name.name_type == 0x1b) {
+                                                        DEBUG(3,("wins_process_name_registration_request: "
+                                                                "Found the #1b record "
+                                                                "with ip %s\n",
+                                                                inet_ntoa(name1brec->data.ip[0])));
+                                                        break;
+                                                }
+                                        }
+                                        if(!name1brec) {
+                                                DEBUG(3,("wins_process_name_registration_request: "
+                                                        "Didn't find a #1b name record. "
+                                                        "Removing the first available "
+                                                        "entry %s\n",
+                                                        inet_ntoa(namerec->data.ip[0])));
+                                                remove_ip_from_name_record(namerec, namerec->data.ip[0]);
+                                                wins_hook("delete", namerec, 0);
+                                        } else {
+                                                int i;
+                                                for(i=0; i<namerec->data.num_ips; i++) {
+                                                        /* The name1brec should only have
+                                                         * the single IP address in it,
+                                                         * so we only check against the first one*/
+                                                        if(!ip_equal_v4( namerec->data.ip[i], name1brec->data.ip[0])) {
+                                                                /* The i'th entry isn't the 1b address; delete it  */
+                                                                DEBUG(3,("wins_process_name_registration_request: "
+                                                                        "Entry at %d is not the #1b address. "
+                                                                        "About to remove it\n",
+                                                                        i));
+                                                                remove_ip_from_name_record(namerec, namerec->data.ip[i]);
+                                                                wins_hook("delete", namerec, 0);
+                                                                break;
+                                                        }
+                                                }
+                                        }
+                                }
+                                /* The list is guaranteed to be < 25 entries now
+                                 * - safe to add a new one  */
                                 add_ip_to_name_record(namerec, from_ip);
                                 /* we need to update the record for replication */
@@ -1867 +1969 @@
 
         if(rcode == 0) {
+
+                int ip_count;
+
                 ttl = (namerec->data.death_time != PERMANENT_TTL) ?  namerec->data.death_time - p->timestamp : lp_max_wins_ttl();
+
+                /* The netbios reply packet data section is limited to 576 bytes.  In theory 
+                 * this should give us space for 96 addresses, but in practice, 86 appears 
+                 * to be the max (don't know why).  If we send any more than that, 
+                 * reply_netbios_packet will fail to send a reply to avoid a memcpy buffer 
+                 * overflow.  Keep the count to 85 and it will be ok */
+                ip_count=namerec->data.num_ips;
+                if(ip_count>85) {
+                        ip_count=85;    
+                }
 
                 /* Copy all known ip addresses into the return data. */
                 /* Optimise for the common case of one IP address so we don't need a malloc. */
 
-                if( namerec->data.num_ips == 1 ) {
+                if( ip_count == 1 ) {
                         prdata = rdata;
                 } else {
-                        if((prdata = (char *)SMB_MALLOC( namerec->data.num_ips * 6 )) == NULL) {
+                        if((prdata = (char *)SMB_MALLOC( ip_count * 6 )) == NULL) {
                                 DEBUG(0,("send_wins_name_query_response: malloc fail !\n"));
                                 return;
@@ -1881 +1996 @@
                 }
 
-                for(i = 0; i < namerec->data.num_ips; i++) {
+                for(i = 0; i < ip_count; i++) {
                         set_nb_flags(&prdata[i*6],namerec->data.nb_flags);
                         putip((char *)&prdata[2+(i*6)], &namerec->data.ip[i]);
@@ -1887 +2002 @@
 
                 sort_query_replies(prdata, i, p->ip);
-                reply_data_len = namerec->data.num_ips * 6;
+                reply_data_len = ip_count * 6;
         }
 
@@ -2026 +2141 @@
         struct name_record *namerec = NULL;
         struct in_addr from_ip;
-        bool releasing_group_name = (nb_flags & NB_GROUP) ? True : False;;
+        bool releasing_group_name = (nb_flags & NB_GROUP) ? True : False;
 
         putip((char *)&from_ip,&nmb->additional->rdata[2]);

trunk/server/source3/nmbd/nmbd_workgroupdb.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
+#include "nmbd/nmbd.h"
 
 extern uint16 samba_nb_type;
@@ -140 +142 @@
   
         if (!work->serverlist) {
-                if (work->prev)
-                        work->prev->next = work->next;
-                if (work->next)
-                        work->next->prev = work->prev;
-  
-                if (subrec->workgrouplist == work)
-                        subrec->workgrouplist = work->next; 
-  
+                DLIST_REMOVE(subrec->workgrouplist, work);
                 ZERO_STRUCTP(work);
                 SAFE_FREE(work);