Fix Coverity bug #902, uninitialized variable.
[ira/wip.git] / source3 / nmbd / nmbd_processlogon.c
index 816b3514644a73ea3dd7b78326a4486b6eb88b13..43e80af394de3ec32b0334be8f8d1024bf8f1629 100644 (file)
@@ -8,7 +8,7 @@
    
    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 2 of the License, or
+   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,
    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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    
    Revision History:
 
 */
 
 #include "includes.h"
+#include "../libcli/netlogon.h"
+#include "../libcli/cldap/cldap.h"
+#include "../lib/tsocket/tsocket.h"
 
 struct sam_database_info {
         uint32 index;
@@ -32,30 +34,267 @@ struct sam_database_info {
         uint32 date_lo, date_hi;
 };
 
-/****************************************************************************
-Send a message to smbd to do a sam delta sync
-**************************************************************************/
+/**
+ * check whether the client belongs to the hosts
+ * for which initial logon should be delayed...
+ */
+static bool delay_logon(const char *peer_name, const char *peer_addr)
+{
+       const char **delay_list = lp_init_logon_delayed_hosts();
+       const char *peer[2];
+
+       if (delay_list == NULL) {
+               return False;
+       }
+
+       peer[0] = peer_name;
+       peer[1] = peer_addr;
+
+       return list_match(delay_list, (const char *)peer, client_match);
+}
+
+static void delayed_init_logon_handler(struct event_context *event_ctx,
+                                      struct timed_event *te,
+                                      struct timeval now,
+                                      void *private_data)
+{
+       struct packet_struct *p = (struct packet_struct *)private_data;
+
+       DEBUG(10, ("delayed_init_logon_handler (%lx): re-queuing packet.\n",
+                  (unsigned long)te));
+
+       queue_packet(p);
+
+       TALLOC_FREE(te);
+}
+
+struct nmbd_proxy_logon_context {
+       struct cldap_socket *cldap_sock;
+};
+
+static struct nmbd_proxy_logon_context *global_nmbd_proxy_logon;
+
+bool initialize_nmbd_proxy_logon(void)
+{
+       const char *cldap_server = lp_parm_const_string(-1, "nmbd_proxy_logon",
+                                                       "cldap_server", NULL);
+       struct nmbd_proxy_logon_context *ctx;
+       NTSTATUS status;
+       struct in_addr addr;
+       char addrstr[INET_ADDRSTRLEN];
+       const char *server_str;
+       int ret;
+       struct tsocket_address *server_addr;
+
+       if (!cldap_server) {
+               return true;
+       }
+
+       addr = interpret_addr2(cldap_server);
+       server_str = inet_ntop(AF_INET, &addr,
+                            addrstr, sizeof(addrstr));
+       if (!server_str || strcmp("0.0.0.0", server_str) == 0) {
+               DEBUG(0,("Failed to resolve[%s] for nmbd_proxy_logon\n",
+                        cldap_server));
+               return false;
+       }
+
+       ctx = talloc_zero(nmbd_event_context(),
+                         struct nmbd_proxy_logon_context);
+       if (!ctx) {
+               return false;
+       }
 
-static void send_repl_message(uint32 low_serial)
+       ret = tsocket_address_inet_from_strings(ctx, "ipv4",
+                                               server_str, LDAP_PORT,
+                                               &server_addr);
+       if (ret != 0) {
+               TALLOC_FREE(ctx);
+               status = map_nt_error_from_unix(errno);
+               DEBUG(0,("Failed to create cldap tsocket_address for %s - %s\n",
+                        server_str, nt_errstr(status)));
+               return false;
+       }
+
+       /* we create a connected udp socket */
+       status = cldap_socket_init(ctx, nmbd_event_context(), NULL,
+                                  server_addr, &ctx->cldap_sock);
+       TALLOC_FREE(server_addr);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(ctx);
+               DEBUG(0,("failed to create cldap socket for %s: %s\n",
+                       server_str, nt_errstr(status)));
+               return false;
+       }
+
+       global_nmbd_proxy_logon = ctx;
+       return true;
+}
+
+struct nmbd_proxy_logon_state {
+       struct in_addr local_ip;
+       struct packet_struct *p;
+       const char *remote_name;
+       uint8_t remote_name_type;
+       const char *remote_mailslot;
+       struct nbt_netlogon_packet req;
+       struct nbt_netlogon_response resp;
+       struct cldap_netlogon io;
+};
+
+static int nmbd_proxy_logon_state_destructor(struct nmbd_proxy_logon_state *s)
+{
+       s->p->locked = false;
+       free_packet(s->p);
+       return 0;
+}
+
+static void nmbd_proxy_logon_done(struct tevent_req *subreq);
+
+static void nmbd_proxy_logon(struct nmbd_proxy_logon_context *ctx,
+                            struct in_addr local_ip,
+                            struct packet_struct *p,
+                            uint8_t *buf,
+                            uint32_t len)
 {
-        TDB_CONTEXT *tdb;
+       struct nmbd_proxy_logon_state *state;
+       enum ndr_err_code ndr_err;
+       DATA_BLOB blob = data_blob_const(buf, len);
+       const char *computer_name = NULL;
+       const char *mailslot_name = NULL;
+       const char *user_name = NULL;
+       const char *domain_sid = NULL;
+       uint32_t acct_control = 0;
+       uint32_t nt_version = 0;
+       struct tevent_req *subreq;
+       fstring source_name;
+       struct dgram_packet *dgram = &p->packet.dgram;
+
+       state = TALLOC_ZERO_P(ctx, struct nmbd_proxy_logon_state);
+       if (!state) {
+               DEBUG(0,("failed to allocate nmbd_proxy_logon_state\n"));
+               return;
+       }
+
+       pull_ascii_nstring(source_name, sizeof(source_name), dgram->source_name.name);
+       state->remote_name = talloc_strdup(state, source_name);
+       state->remote_name_type = dgram->source_name.name_type,
+       state->local_ip = local_ip;
+       state->p = p;
+
+       ndr_err = ndr_pull_struct_blob(
+               &blob, state, NULL, &state->req,
+               (ndr_pull_flags_fn_t)ndr_pull_nbt_netlogon_packet);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
+               DEBUG(0,("failed parse nbt_letlogon_packet: %s\n",
+                       nt_errstr(status)));
+               TALLOC_FREE(state);
+               return;
+       }
+
+       if (DEBUGLEVEL >= 10) {
+               DEBUG(10, ("nmbd_proxy_logon:\n"));
+               NDR_PRINT_DEBUG(nbt_netlogon_packet, &state->req);
+       }
+
+       switch (state->req.command) {
+       case LOGON_SAM_LOGON_REQUEST:
+               computer_name   = state->req.req.logon.computer_name;
+               user_name       = state->req.req.logon.user_name;
+               mailslot_name   = state->req.req.logon.mailslot_name;
+               acct_control    = state->req.req.logon.acct_control;
+               if (state->req.req.logon.sid_size > 0) {
+                       domain_sid = dom_sid_string(state,
+                                                   &state->req.req.logon.sid);
+                       if (!domain_sid) {
+                               DEBUG(0,("failed to get a string for sid\n"));
+                               TALLOC_FREE(state);
+                               return;
+                       }
+               }
+               nt_version      = state->req.req.logon.nt_version;
+               break;
 
-        tdb = tdb_open_log(lock_path("connections.tdb"), 0,
-                           TDB_DEFAULT, O_RDONLY, 0);
+       default:
+               /* this can't happen as the caller already checks the command */
+               break;
+       }
+
+       state->remote_mailslot = mailslot_name;
+
+       if (user_name && strlen(user_name) == 0) {
+               user_name = NULL;
+       }
+
+       if (computer_name && strlen(computer_name) == 0) {
+               computer_name = NULL;
+       }
 
-        if (!tdb) {
-                DEBUG(3, ("send_repl_message(): failed to open connections "
-                          "database\n"));
-                return;
-        }
+       /*
+        * as the socket is connected,
+        * we don't need to specify the destination
+        */
+       state->io.in.dest_address       = NULL;
+       state->io.in.dest_port          = 0;
+       state->io.in.realm              = NULL;
+       state->io.in.host               = computer_name;
+       state->io.in.user               = user_name;
+       state->io.in.domain_guid        = NULL;
+       state->io.in.domain_sid         = domain_sid;
+       state->io.in.acct_control       = acct_control;
+       state->io.in.version            = nt_version;
+       state->io.in.map_response       = false;
+
+       subreq = cldap_netlogon_send(state,
+                                    ctx->cldap_sock,
+                                    &state->io);
+       if (!subreq) {
+               DEBUG(0,("failed to send cldap netlogon call\n"));
+               TALLOC_FREE(state);
+               return;
+       }
+       tevent_req_set_callback(subreq, nmbd_proxy_logon_done, state);
+
+       /* we reply async */
+       state->p->locked = true;
+       talloc_set_destructor(state, nmbd_proxy_logon_state_destructor);
+}
+
+static void nmbd_proxy_logon_done(struct tevent_req *subreq)
+{
+       struct nmbd_proxy_logon_state *state =
+               tevent_req_callback_data(subreq,
+               struct nmbd_proxy_logon_state);
+       NTSTATUS status;
+       DATA_BLOB response = data_blob_null;
+
+       status = cldap_netlogon_recv(subreq, NULL, state, &state->io);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("failed to recv cldap netlogon call: %s\n",
+                       nt_errstr(status)));
+               TALLOC_FREE(state);
+               return;
+       }
 
-        DEBUG(3, ("sending replication message, serial = 0x%04x\n", 
-                  low_serial));
-        
-        message_send_all(tdb, MSG_SMB_SAM_REPL, &low_serial,
-                         sizeof(low_serial), False, NULL);
+       status = push_netlogon_samlogon_response(&response, state, NULL,
+                                                &state->io.out.netlogon);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("failed to push netlogon_samlogon_response: %s\n",
+                       nt_errstr(status)));
+               TALLOC_FREE(state);
+               return;
+       }
 
-        tdb_close(tdb);
+       send_mailslot(true, state->remote_mailslot,
+                     (char *)response.data, response.length,
+                     global_myname(), 0x0,
+                     state->remote_name,
+                     state->remote_name_type,
+                     state->p->ip,
+                     state->local_ip,
+                     state->p->port);
+       TALLOC_FREE(state);
 }
 
 /****************************************************************************
@@ -66,53 +305,81 @@ void process_logon_packet(struct packet_struct *p, char *buf,int len,
                           const char *mailslot)
 {
        struct dgram_packet *dgram = &p->packet.dgram;
-       pstring my_name;
+       fstring my_name;
        fstring reply_name;
-       pstring outbuf;
+       char outbuf[1024];
        int code;
        uint16 token = 0;
        uint32 ntversion = 0;
        uint16 lmnttoken = 0;
        uint16 lm20token = 0;
        uint32 domainsidsize;
-       BOOL short_request = False;
+       bool short_request = False;
        char *getdc;
        char *uniuser; /* Unicode user name. */
-       pstring ascuser;
+       fstring ascuser;
        char *unicomp; /* Unicode computer name. */
+       size_t size;
+       struct sockaddr_storage ss;
+       const struct sockaddr_storage *pss;
+       struct in_addr ip;
+
+       in_addr_to_sockaddr_storage(&ss, p->ip);
+       pss = iface_ip((struct sockaddr *)&ss);
+       if (!pss) {
+               DEBUG(5,("process_logon_packet:can't find outgoing interface "
+                       "for packet from IP %s\n",
+                       inet_ntoa(p->ip) ));
+               return;
+       }
+       ip = ((struct sockaddr_in *)pss)->sin_addr;
 
        memset(outbuf, 0, sizeof(outbuf));
 
        if (!lp_domain_logons()) {
-               DEBUG(3,("process_logon_packet: Logon packet received from IP %s and domain \
+               DEBUG(5,("process_logon_packet: Logon packet received from IP %s and domain \
 logons are not enabled.\n", inet_ntoa(p->ip) ));
                return;
        }
 
-       pstrcpy(my_name, global_myname());
+       fstrcpy(my_name, global_myname());
 
-       code = SVAL(buf,0);
-       DEBUG(1,("process_logon_packet: Logon from %s: code = 0x%x\n", inet_ntoa(p->ip), code));
+       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:    
+               case 0:
                        {
                                fstring mach_str, user_str, getdc_str;
                                char *q = buf + 2;
                                char *machine = q;
-                               char *user = skip_string(machine,1);
+                               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);
 
-                               getdc = skip_string(user,1);
-                               q = skip_string(getdc,1);
+                               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); 
+                               fstrcpy(reply_name,my_name);
 
                                pull_ascii_fstring(mach_str, machine);
                                pull_ascii_fstring(user_str, user);
                                pull_ascii_fstring(getdc_str, getdc);
 
-                               DEBUG(3,("process_logon_packet: Domain login request from %s at IP %s user=%s token=%x\n",
+                               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;
@@ -121,37 +388,52 @@ logons are not enabled.\n", inet_ntoa(p->ip) ));
 
                                fstrcpy(reply_name, "\\\\");
                                fstrcat(reply_name, my_name);
-                               push_ascii_fstring(q, reply_name);
-                               q = skip_string(q, 1); /* PDC 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, outbuf, PTR_DIFF(q, outbuf));
+                               dump_data(4, (uint8 *)outbuf, PTR_DIFF(q, outbuf));
 
-                               send_mailslot(True, getdc_str, 
+                               send_mailslot(True, getdc_str,
                                                outbuf,PTR_DIFF(q,outbuf),
                                                global_myname(), 0x0,
                                                mach_str,
                                                dgram->source_name.name_type,
-                                               p->ip, *iface_ip(p->ip), p->port);  
+                                               p->ip, ip, p->port);
                                break;
                        }
 
-               case QUERYFORPDC:
+               case LOGON_PRIMARY_QUERY:
                        {
                                fstring mach_str, getdc_str;
-                               nstring source_name;
+                               fstring source_name;
                                char *q = buf + 2;
                                char *machine = q;
 
-                               if (!lp_domain_master()) {  
+                               if (!lp_domain_master()) {
                                        /* We're not Primary Domain Controller -- ignore this */
                                        return;
                                }
 
-                               getdc = skip_string(machine,1);
-                               q = skip_string(getdc,1);
+                               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
@@ -165,9 +447,19 @@ logons are not enabled.\n", inet_ntoa(p->ip) ));
                                } 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
@@ -180,6 +472,12 @@ logons are not enabled.\n", inet_ntoa(p->ip) ));
                                                }
                                                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);
@@ -187,20 +485,32 @@ logons are not enabled.\n", inet_ntoa(p->ip) ));
 
                                /* Construct reply. */
                                q = outbuf;
-                               SSVAL(q, 0, QUERYFORPDC_R);
+                               SSVAL(q, 0, NETLOGON_RESPONSE_FROM_PDC);
                                q += 2;
 
                                fstrcpy(reply_name,my_name);
-                               push_ascii_fstring(q, reply_name);
-                               q = skip_string(q, 1); /* PDC 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(pstring), True); /* PDC name */
-                                       q += dos_PutUniCode(q, lp_workgroup(),sizeof(pstring), True); /* Domain name*/
+                                       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 */
@@ -211,51 +521,82 @@ logons are not enabled.\n", inet_ntoa(p->ip) ));
 
                                pull_ascii_fstring(mach_str, machine);
 
-                               DEBUG(3,("process_logon_packet: GETDC request from %s at IP %s, \
+                               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(),
-                                       QUERYFORPDC_R, (uint32)ntversion, (uint32)lmnttoken,
+                                       NETLOGON_RESPONSE_FROM_PDC, (uint32)ntversion, (uint32)lmnttoken,
                                        (uint32)lm20token ));
 
-                               dump_data(4, outbuf, PTR_DIFF(q, outbuf));
+                               dump_data(4, (uint8 *)outbuf, PTR_DIFF(q, outbuf));
 
                                pull_ascii_fstring(getdc_str, getdc);
-                               pull_ascii_nstring(source_name, dgram->source_name.name);
+                               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, *iface_ip(p->ip), p->port);  
+                                       p->ip, ip, p->port);
                                return;
                        }
 
-               case SAMLOGON:
+               case LOGON_SAM_LOGON_REQUEST:
 
                        {
                                fstring getdc_str;
-                               nstring source_name;
+                               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));
-                               q = skip_string(getdc,1);
+
+                               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(3,("process_logon_packet: SAMLOGON sidsize %d, len = %d\n", domainsidsize, len));
+                               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(3,("process_logon_packet: len = %d PTR_DIFF(q, buf) = %d\n", len, PTR_DIFF(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
@@ -270,28 +611,33 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
                                        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: SAMLOGON sidsize %d ntv %d\n", domainsidsize, ntversion));
+                               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_pstring(ascuser, uniuser);
+                               pull_ucs2_fstring(ascuser, uniuser);
                                pull_ucs2_fstring(asccomp, unicomp);
-                               DEBUG(3,("process_logon_packet: SAMLOGON user %s\n", ascuser));
+                               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(3,("process_logon_packet: SAMLOGON request from %s(%s) for %s, returning logon svr %s domain %s code %x token=%x\n",
+                               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(),
-                               SAMLOGON_R ,lmnttoken));
+                               LOGON_SAM_LOGON_RESPONSE ,lmnttoken));
 
                                /* Construct reply. */
 
@@ -300,61 +646,97 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
                                /* 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, SAMLOGON_UNK_R);    /* user unknown */
+                                               SSVAL(q, 0, LOGON_SAM_LOGON_USER_UNKNOWN);      /* user unknown */
                                        } else {
-                                               SSVAL(q, 0, SAMLOGON_R);
+                                               SSVAL(q, 0, LOGON_SAM_LOGON_RESPONSE);
                                        }
 
                                        q += 2;
 
-                                       q += dos_PutUniCode(q, reply_name,sizeof(pstring), True);
-                                       q += dos_PutUniCode(q, ascuser, sizeof(pstring), True);
-                                       q += dos_PutUniCode(q, lp_workgroup(),sizeof(pstring), True);
+                                       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 {
-                                       GUID domain_guid;
-                                       pstring domain;
-                                       pstring hostname;
+                                       struct GUID domain_guid;
+                                       UUID_FLAT flat_guid;
+                                       char *domain;
+                                       char *hostname;
                                        char *component, *dc, *q1;
-                                       uint8 size;
                                        char *q_orig = q;
                                        int str_offset;
+                                       char *saveptr = NULL;
 
-                                       get_mydomname(domain);
-                                       get_myname(hostname);
-       
+                                       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, SAMLOGON_AD_UNK_R); /* user unknown */
+                                               SIVAL(q, 0, LOGON_SAM_LOGON_USER_UNKNOWN_EX);   /* user unknown */
                                        } else {
-                                               SIVAL(q, 0, SAMLOGON_AD_R);
+                                               SIVAL(q, 0, LOGON_SAM_LOGON_RESPONSE_EX);
                                        }
                                        q += 4;
 
-                                       SIVAL(q, 0, ADS_PDC|ADS_GC|ADS_LDAP|ADS_DS|
-                                               ADS_KDC|ADS_TIMESERV|ADS_CLOSEST|ADS_WRITABLE);
+                                       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;
                                        }
-                                       memcpy(q, &domain_guid, sizeof(domain_guid));
-                                       q += sizeof(domain_guid);
+
+                                       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(dc, "."))) {
+                                       while ((component = strtok_r(dc, ".", &saveptr)) != NULL) {
                                                dc = NULL;
-                                               size = push_ascii(&q[1], component, -1, 0);
+                                               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++;
 
@@ -364,44 +746,89 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
                                        q += 2;
 
                                        /* Hostname */
-                                       size = push_ascii(&q[1], hostname, -1, 0);
+                                       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(), -1, STR_UPPER);
+                                       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, -1, 0);
+                                       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, -1, 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 */
-                                       size = push_ascii(&q[1], "Default-First-Site-Name", -1, 0);
+                                       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));
@@ -413,105 +840,91 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
 
                                        SIVAL(q, 0, 0x00000002);
                                        q += 4; /* unknown */
-                                       SIVAL(q, 0, (iface_ip(p->ip))->s_addr);
+                                       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, 4, 0xffff); /* our lmnttoken */
                                SSVAL(q, 6, 0xffff); /* our lm20token */
                                q += 8;
 
-                               dump_data(4, outbuf, PTR_DIFF(q, outbuf));
+                               dump_data(4, (uint8 *)outbuf, PTR_DIFF(q, outbuf));
 
                                pull_ascii_fstring(getdc_str, getdc);
-                               pull_ascii_nstring(source_name, dgram->source_name.name);
-
-                               send_mailslot(True, getdc,
-                                       outbuf,PTR_DIFF(q,outbuf),
-                                       global_myname(), 0x0,
-                                       dgram->source_name.name,
-                                       dgram->source_name.name_type,
-                                       p->ip, *iface_ip(p->ip), p->port);  
-                               break;
-                       }
-
-               /* Announce change to UAS or SAM.  Send by the domain controller when a
-               replication event is required. */
-
-               case SAM_UAS_CHANGE:
-                       {
-                               struct sam_database_info *db_info;
-                               char *q = buf + 2;
-                               int i, db_count;
-                               uint32 low_serial;
-          
-                               /* Header */
-          
-                               low_serial = IVAL(q, 0); q += 4;     /* Low serial number */
-
-                               q += 4;                   /* Date/time */
-                               q += 4;                   /* Pulse */
-                               q += 4;                   /* Random */
-          
-                               /* Domain info */
-          
-                               q = skip_string(q, 1);    /* PDC name */
-                               q = skip_string(q, 1);    /* Domain name */
-                               q = skip_unibuf(q, PTR_DIFF(buf + len, q)); /* Unicode PDC name */
-                               q = skip_unibuf(q, PTR_DIFF(buf + len, q)); /* Unicode domain name */
-          
-                               /* Database info */
-          
-                               db_count = SVAL(q, 0); q += 2;
-          
-                               db_info = (struct sam_database_info *)
-                                               malloc(sizeof(struct sam_database_info) * db_count);
-
-                               if (db_info == NULL) {
-                                       DEBUG(3, ("out of memory allocating info for %d databases\n", db_count));
+                               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;
                                }
-          
-                               for (i = 0; i < db_count; i++) {
-                                       db_info[i].index = IVAL(q, 0);
-                                       db_info[i].serial_lo = IVAL(q, 4);
-                                       db_info[i].serial_hi = IVAL(q, 8);
-                                       db_info[i].date_lo = IVAL(q, 12);
-                                       db_info[i].date_hi = IVAL(q, 16);
-                                       q += 20;
-                               }
-
-                               /* Domain SID */
-
-#if 0
-                               /* We must range check this. */
-                               q += IVAL(q, 0) + 4;  /* 4 byte length plus data */
-          
-                               q += 2;               /* Alignment? */
-
-                               /* Misc other info */
-
-                               q += 4;               /* NT version (0x1) */
-                               q += 2;               /* LMNT token (0xff) */
-                               q += 2;               /* LM20 token (0xff) */
-#endif
 
-                               SAFE_FREE(db_info);        /* Not sure whether we need to do anything useful with these */
+                               /*
+                                * 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);
+                               }
 
-                               /* Send message to smbd */
+                               SAFE_FREE(source_addr);
 
-                               send_repl_message(low_serial);
                                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",code));
                        return;