r10656: BIG merge from trunk. Features not copied over
[amitay/samba.git] / source3 / smbd / process.c
index c796797fad126dff5664d2830cc28b6ac2d8acc6..0b7b94cce21152193c438178802701bfbff0995e 100644 (file)
@@ -2,6 +2,7 @@
    Unix SMB/CIFS implementation.
    process incoming packets - main loop
    Copyright (C) Andrew Tridgell 1992-1998
+   Copyright (C) Volker Lendecke 2005
    
    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
 
 #include "includes.h"
 
+extern uint16 global_smbpid;
+extern int keepalive;
+extern struct auth_context *negprot_global_auth_context;
+extern int smb_echo_count;
+
 struct timeval smb_last_time;
 
 static char *InBuffer = NULL;
-char *OutBuffer = NULL;
-char *last_inbuf = NULL;
+static char *OutBuffer = NULL;
+static char *current_inbuf = NULL;
 
 /* 
  * Size of data we can send to client. Set
@@ -39,85 +45,372 @@ int max_send = BUFFER_SIZE;
 int max_recv = BUFFER_SIZE;
 
 extern int last_message;
-extern int global_oplock_break;
 extern userdom_struct current_user_info;
 extern int smb_read_error;
 SIG_ATOMIC_T reload_after_sighup = 0;
 SIG_ATOMIC_T got_sig_term = 0;
 extern BOOL global_machine_password_needs_changing;
-extern fstring global_myworkgroup;
-extern pstring global_myname;
 extern int max_send;
 
+/****************************************************************************
+ Function to return the current request mid from Inbuffer.
+****************************************************************************/
+
+uint16 get_current_mid(void)
+{
+       return SVAL(InBuffer,smb_mid);
+}
+
 /****************************************************************************
  structure to hold a linked list of queued messages.
  for processing.
 ****************************************************************************/
 
-typedef struct {
-   ubi_slNode msg_next;
-   char *msg_buf;
-   int msg_len;
-} pending_message_list;
-
-static ubi_slList smb_oplock_queue = { NULL, (ubi_slNodePtr)&smb_oplock_queue, 0};
+static struct pending_message_list *deferred_open_queue;
 
 /****************************************************************************
  Function to push a message onto the tail of a linked list of smb messages ready
  for processing.
 ****************************************************************************/
 
-static BOOL push_message(ubi_slList *list_head, char *buf, int msg_len)
+static BOOL push_queued_message(char *buf, int msg_len,
+                               struct timeval request_time,
+                               struct timeval end_time,
+                               char *private_data, size_t private_len)
 {
-  pending_message_list *msg = (pending_message_list *)
-                               malloc(sizeof(pending_message_list));
+       struct pending_message_list *tmp_msg;
+       struct pending_message_list *msg;
 
-  if(msg == NULL)
-  {
-    DEBUG(0,("push_message: malloc fail (1)\n"));
-    return False;
-  }
+       msg = TALLOC_ZERO_P(NULL, struct pending_message_list);
 
-  msg->msg_buf = (char *)malloc(msg_len);
-  if(msg->msg_buf == NULL)
-  {
-    DEBUG(0,("push_message: malloc fail (2)\n"));
-    SAFE_FREE(msg);
-    return False;
-  }
+       if(msg == NULL) {
+               DEBUG(0,("push_message: malloc fail (1)\n"));
+               return False;
+       }
 
-  memcpy(msg->msg_buf, buf, msg_len);
-  msg->msg_len = msg_len;
+       msg->buf = data_blob_talloc(msg, buf, msg_len);
+       if(msg->buf.data == NULL) {
+               DEBUG(0,("push_message: malloc fail (2)\n"));
+               talloc_free(msg);
+               return False;
+       }
 
-  ubi_slAddTail( list_head, msg);
+       msg->request_time = request_time;
+       msg->end_time = end_time;
 
-  return True;
+       if (private_data) {
+               msg->private_data = data_blob_talloc(msg, private_data,
+                                                    private_len);
+               if (msg->private_data.data == NULL) {
+                       DEBUG(0,("push_message: malloc fail (3)\n"));
+                       talloc_free(msg);
+                       return False;
+               }
+       }
+
+       DLIST_ADD_END(deferred_open_queue, msg, tmp_msg);
+
+       DEBUG(10,("push_message: pushed message length %u on "
+                 "deferred_open_queue\n", (unsigned int)msg_len));
+
+       return True;
 }
 
 /****************************************************************************
- Function to push a smb message onto a linked list of local smb messages ready
- for processing.
+ Function to delete a sharing violation open message by mid.
 ****************************************************************************/
 
-BOOL push_oplock_pending_smb_message(char *buf, int msg_len)
+void remove_deferred_open_smb_message(uint16 mid)
 {
-       return push_message(&smb_oplock_queue, buf, msg_len);
+       struct pending_message_list *pml;
+
+       for (pml = deferred_open_queue; pml; pml = pml->next) {
+               if (mid == SVAL(pml->buf.data,smb_mid)) {
+                       DEBUG(10,("remove_sharing_violation_open_smb_message: "
+                                 "deleting mid %u len %u\n",
+                                 (unsigned int)mid,
+                                 (unsigned int)pml->buf.length ));
+                       DLIST_REMOVE(deferred_open_queue, pml);
+                       talloc_free(pml);
+                       return;
+               }
+       }
 }
 
 /****************************************************************************
- Do all async processing in here. This includes UDB oplock messages, kernel
oplock messages, change notify events etc.
+ Move a sharing violation open retry message to the front of the list and
schedule it for immediate processing.
 ****************************************************************************/
 
-static void async_processing(char *buffer, int buffer_len)
+void schedule_deferred_open_smb_message(uint16 mid)
 {
-       DEBUG(10,("async_processing: Doing async processing.\n"));
+       struct pending_message_list *pml;
+       int i = 0;
+
+       for (pml = deferred_open_queue; pml; pml = pml->next) {
+               uint16 msg_mid = SVAL(pml->buf.data,smb_mid);
+               DEBUG(10,("schedule_deferred_open_smb_message: [%d] msg_mid = %u\n", i++,
+                       (unsigned int)msg_mid ));
+               if (mid == msg_mid) {
+                       DEBUG(10,("schedule_deferred_open_smb_message: scheduling mid %u\n",
+                               mid ));
+                       pml->end_time.tv_sec = 0;
+                       pml->end_time.tv_usec = 0;
+                       DLIST_PROMOTE(deferred_open_queue, pml);
+                       return;
+               }
+       }
+
+       DEBUG(10,("schedule_deferred_open_smb_message: failed to find message mid %u\n",
+               mid ));
+}
+
+/****************************************************************************
+ Return true if this mid is on the deferred queue.
+****************************************************************************/
+
+BOOL open_was_deferred(uint16 mid)
+{
+       struct pending_message_list *pml;
+
+       for (pml = deferred_open_queue; pml; pml = pml->next) {
+               if (SVAL(pml->buf.data,smb_mid) == mid) {
+                       set_saved_ntstatus(NT_STATUS_OK);
+                       return True;
+               }
+       }
+       return False;
+}
+
+/****************************************************************************
+ Return the message queued by this mid.
+****************************************************************************/
+
+struct pending_message_list *get_open_deferred_message(uint16 mid)
+{
+       struct pending_message_list *pml;
+
+       for (pml = deferred_open_queue; pml; pml = pml->next) {
+               if (SVAL(pml->buf.data,smb_mid) == mid) {
+                       return pml;
+               }
+       }
+       return NULL;
+}
+
+/****************************************************************************
+ Function to push a deferred open smb message onto a linked list of local smb
+ messages ready for processing.
+****************************************************************************/
+
+BOOL push_deferred_smb_message(uint16 mid,
+                              struct timeval request_time,
+                              struct timeval timeout,
+                              char *private_data, size_t priv_len)
+{
+       struct timeval end_time;
+
+       end_time = timeval_sum(&request_time, &timeout);
+
+       DEBUG(10,("push_deferred_open_smb_message: pushing message len %u mid %u "
+                 "timeout time [%u.%06u]\n",
+                 (unsigned int) smb_len(current_inbuf)+4, (unsigned int)mid,
+                 (unsigned int)end_time.tv_sec,
+                 (unsigned int)end_time.tv_usec));
+
+       return push_queued_message(current_inbuf, smb_len(current_inbuf)+4,
+                                  request_time, end_time,
+                                  private_data, priv_len);
+}
+
+static struct timed_event *timed_events;
+
+struct timed_event {
+       struct timed_event *next, *prev;
+       struct timeval when;
+       const char *event_name;
+       void (*handler)(struct timed_event *te,
+                       const struct timeval *now,
+                       void *private_data);
+       void *private_data;
+};
+
+static int timed_event_destructor(void *p)
+{
+       struct timed_event *te = talloc_get_type_abort(p, struct timed_event);
+       DEBUG(10, ("Destroying timed event %lx \"%s\"\n", (unsigned long)te,
+                  te->event_name));
+       DLIST_REMOVE(timed_events, te);
+       return 0;
+}
+
+/****************************************************************************
+ Schedule a function for future calling, cancel with talloc_free().
+ It's the responsibility of the handler to call talloc_free() on the event 
+ handed to it.
+****************************************************************************/
+
+struct timed_event *add_timed_event(TALLOC_CTX *mem_ctx,
+                                   struct timeval when,
+                                   const char *event_name,
+                                   void (*handler)(struct timed_event *te,
+                                                   const struct timeval *now,
+                                                   void *private_data),
+                                   void *private_data)
+{
+       struct timed_event *te, *last_te, *cur_te;
+
+       te = TALLOC_P(mem_ctx, struct timed_event);
+       if (te == NULL) {
+               DEBUG(0, ("talloc failed\n"));
+               return NULL;
+       }
+
+       te->when = when;
+       te->event_name = event_name;
+       te->handler = handler;
+       te->private_data = private_data;
+
+       /* keep the list ordered */
+       last_te = NULL;
+       for (cur_te = timed_events; cur_te; cur_te = cur_te->next) {
+               /* if the new event comes before the current one break */
+               if (!timeval_is_zero(&cur_te->when) &&
+                   timeval_compare(&te->when, &cur_te->when) < 0) {
+                       break;
+               }
+               last_te = cur_te;
+       }
+
+       DLIST_ADD_AFTER(timed_events, te, last_te);
+       talloc_set_destructor(te, timed_event_destructor);
+
+       DEBUG(10, ("Added timed event \"%s\": %lx\n", event_name,
+                  (unsigned long)te));
+       return te;
+}
+
+static void run_events(void)
+{
+       struct timeval now;
+
+       if (timed_events == NULL) {
+               /* No syscall if there are no events */
+               DEBUG(10, ("run_events: No events\n"));
+               return;
+       }
+
+       GetTimeOfDay(&now);
+
+       if (timeval_compare(&now, &timed_events->when) < 0) {
+               /* Nothing to do yet */
+               DEBUG(10, ("run_events: Nothing to do\n"));
+               return;
+       }
+
+       DEBUG(10, ("Running event \"%s\" %lx\n", timed_events->event_name,
+                  (unsigned long)timed_events));
+
+       timed_events->handler(timed_events, &now, timed_events->private_data);
+       return;
+}
+
+struct timeval timed_events_timeout(void)
+{
+       struct timeval now, timeout;
+
+       if (timed_events == NULL) {
+               return timeval_set(SMBD_SELECT_TIMEOUT, 0);
+       }
 
-       /* check for oplock messages (both UDP and kernel) */
-       if (receive_local_message(buffer, buffer_len, 1)) {
-               process_local_message(buffer, buffer_len);
+       now = timeval_current();
+       timeout = timeval_until(&now, &timed_events->when);
+
+       DEBUG(10, ("timed_events_timeout: %d/%d\n", (int)timeout.tv_sec,
+                  (int)timeout.tv_usec));
+
+       return timeout;
+}
+
+struct idle_event {
+       struct timed_event *te;
+       struct timeval interval;
+       BOOL (*handler)(const struct timeval *now, void *private_data);
+       void *private_data;
+};
+
+static void idle_event_handler(struct timed_event *te,
+                              const struct timeval *now,
+                              void *private_data)
+{
+       struct idle_event *event =
+               talloc_get_type_abort(private_data, struct idle_event);
+
+       talloc_free(event->te);
+
+       if (!event->handler(now, event->private_data)) {
+               /* Don't repeat, delete ourselves */
+               talloc_free(event);
+               return;
        }
 
+       event->te = add_timed_event(event, timeval_sum(now, &event->interval),
+                                   "idle_event_handler",
+                                   idle_event_handler, event);
+
+       /* We can't do much but fail here. */
+       SMB_ASSERT(event->te != NULL);
+}
+
+struct idle_event *add_idle_event(TALLOC_CTX *mem_ctx,
+                                 struct timeval interval,
+                                 BOOL (*handler)(const struct timeval *now,
+                                                 void *private_data),
+                                 void *private_data)
+{
+       struct idle_event *result;
+       struct timeval now = timeval_current();
+
+       result = TALLOC_P(mem_ctx, struct idle_event);
+       if (result == NULL) {
+               DEBUG(0, ("talloc failed\n"));
+               return NULL;
+       }
+
+       result->interval = interval;
+       result->handler = handler;
+       result->private_data = private_data;
+
+       result->te = add_timed_event(result, timeval_sum(&now, &interval),
+                                    "idle_event_handler",
+                                    idle_event_handler, result);
+       if (result->te == NULL) {
+               DEBUG(0, ("add_timed_event failed\n"));
+               talloc_free(result);
+               return NULL;
+       }
+
+       return result;
+}
+       
+/****************************************************************************
+ Do all async processing in here. This includes kernel oplock messages, change
+ notify events etc.
+****************************************************************************/
+
+static void async_processing(void)
+{
+       DEBUG(10,("async_processing: Doing async processing.\n"));
+
+       process_aio_queue();
+
+       process_kernel_oplocks();
+
+       /* Do the aio check again after receive_local_message as it does a
+          select and may have eaten our signal. */
+       /* Is this till true? -- vl */
+       process_aio_queue();
+
        if (got_sig_term) {
                exit_server("Caught TERM signal");
        }
@@ -159,13 +452,18 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
 {
        fd_set fds;
        int selrtn;
-       struct timeval to;
+       struct timeval to = timeval_set(SMBD_SELECT_TIMEOUT, 0);
        int maxfd;
 
        smb_read_error = 0;
 
  again:
 
+       if (timeout >= 0) {
+               to.tv_sec = timeout / 1000;
+               to.tv_usec = (timeout % 1000) * 1000;
+       }
+
        /*
         * Note that this call must be before processing any SMB
         * messages as we need to synchronously process any messages
@@ -174,22 +472,44 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
        message_dispatch();
 
        /*
-        * Check to see if we already have a message on the smb queue.
-        * If so - copy and return it.
+        * Check to see if we already have a message on the deferred open queue
+        * and it's time to schedule.
         */
-       if(ubi_slCount(&smb_oplock_queue) != 0) {
-               pending_message_list *msg = (pending_message_list *)ubi_slRemHead(&smb_oplock_queue);
-               memcpy(buffer, msg->msg_buf, MIN(buffer_len, msg->msg_len));
+       if(deferred_open_queue != NULL) {
+               BOOL pop_message = False;
+               struct pending_message_list *msg = deferred_open_queue;
+
+               if (timeval_is_zero(&msg->end_time)) {
+                       pop_message = True;
+               } else {
+                       struct timeval tv;
+                       SMB_BIG_INT tdif;
+
+                       GetTimeOfDay(&tv);
+                       tdif = usec_time_diff(&msg->end_time, &tv);
+                       if (tdif <= 0) {
+                               /* Timed out. Schedule...*/
+                               pop_message = True;
+                               DEBUG(10,("receive_message_or_smb: queued message timed out.\n"));
+                       } else {
+                               /* Make a more accurate select timeout. */
+                               to.tv_sec = tdif / 1000000;
+                               to.tv_usec = tdif % 1000000;
+                               DEBUG(10,("receive_message_or_smb: select with timeout of [%u.%06u]\n",
+                                       (unsigned int)to.tv_sec, (unsigned int)to.tv_usec ));
+                       }
+               }
+
+               if (pop_message) {
+                       memcpy(buffer, msg->buf.data, MIN(buffer_len, msg->buf.length));
   
-               /* Free the message we just copied. */
-               SAFE_FREE(msg->msg_buf);
-               SAFE_FREE(msg);
-               
-               DEBUG(5,("receive_message_or_smb: returning queued smb message.\n"));
-               return True;
+                       /* We leave this message on the queue so the open code can
+                          know this is a retry. */
+                       DEBUG(5,("receive_message_or_smb: returning deferred open smb message.\n"));
+                       return True;
+               }
        }
 
-
        /*
         * Setup the select read fd set.
         */
@@ -207,7 +527,7 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
 
        if (oplock_message_waiting(&fds)) {
                DEBUG(10,("receive_message_or_smb: oplock_message is waiting.\n"));
-               async_processing(buffer, buffer_len);
+               async_processing();
                /*
                 * After async processing we must go and do the select again, as
                 * the state of the flag in fds for the server file descriptor is
@@ -215,21 +535,26 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
                 */
                goto again;
        }
+
+       {
+               struct timeval tmp = timed_events_timeout();
+               to = timeval_min(&to, &tmp);
+               if (timeval_is_zero(&to)) {
+                       return True;
+               }
+       }
        
        FD_SET(smbd_server_fd(),&fds);
        maxfd = setup_oplock_select_set(&fds);
 
-       to.tv_sec = timeout / 1000;
-       to.tv_usec = (timeout % 1000) * 1000;
-
-       selrtn = sys_select(MAX(maxfd,smbd_server_fd())+1,&fds,NULL,NULL,timeout>0?&to:NULL);
+       selrtn = sys_select(MAX(maxfd,smbd_server_fd())+1,&fds,NULL,NULL,&to);
 
        /* if we get EINTR then maybe we have received an oplock
           signal - treat this as select returning 1. This is ugly, but
           is the best we can do until the oplock code knows more about
           signals */
        if (selrtn == -1 && errno == EINTR) {
-               async_processing(buffer, buffer_len);
+               async_processing();
                /*
                 * After async processing we must go and do the select again, as
                 * the state of the flag in fds for the server file descriptor is
@@ -258,7 +583,7 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
         */
 
        if (oplock_message_waiting(&fds)) {
-               async_processing(buffer, buffer_len);
+               async_processing();
                /*
                 * After async processing we must go and do the select again, as
                 * the state of the flag in fds for the server file descriptor is
@@ -297,28 +622,19 @@ BOOL receive_next_smb(char *inbuf, int bufsize, int timeout)
 
 void respond_to_all_remaining_local_messages(void)
 {
-  char buffer[1024];
-
-  /*
-   * Assert we have no exclusive open oplocks.
-   */
-
-  if(get_number_of_exclusive_open_oplocks()) {
-    DEBUG(0,("respond_to_all_remaining_local_messages: PANIC : we have %d exclusive oplocks.\n",
-          get_number_of_exclusive_open_oplocks() ));
-    return;
-  }
-
-  /*
-   * Keep doing receive_local_message with a 1 ms timeout until
-   * we have no more messages.
-   */
-  while(receive_local_message(buffer, sizeof(buffer), 1)) {
-         /* Deal with oplock break requests from other smbd's. */
-         process_local_message(buffer, sizeof(buffer));
-  }
-
-  return;
+       /*
+        * Assert we have no exclusive open oplocks.
+        */
+
+       if(get_number_of_exclusive_open_oplocks()) {
+               DEBUG(0,("respond_to_all_remaining_local_messages: PANIC : we have %d exclusive oplocks.\n",
+                       get_number_of_exclusive_open_oplocks() ));
+               return;
+       }
+
+       process_kernel_oplocks();
+
+       return;
 }
 
 
@@ -334,39 +650,37 @@ force write permissions on print services.
 #define TIME_INIT (1<<2)
 #define CAN_IPC (1<<3)
 #define AS_GUEST (1<<5)
-#define QUEUE_IN_OPLOCK (1<<6)
+#define DO_CHDIR (1<<6)
 
 /* 
    define a list of possible SMB messages and their corresponding
    functions. Any message that has a NULL function is unimplemented -
    please feel free to contribute implementations!
 */
-const static struct smb_message_struct
-{
-  const char *name;
-  int (*fn)(connection_struct *conn, char *, char *, int, int);
-  int flags;
-}
- smb_messages[256] = {
+static const struct smb_message_struct {
+       const char *name;
+       int (*fn)(connection_struct *conn, char *, char *, int, int);
+       int flags;
+} smb_messages[256] = {
 
 /* 0x00 */ { "SMBmkdir",reply_mkdir,AS_USER | NEED_WRITE},
 /* 0x01 */ { "SMBrmdir",reply_rmdir,AS_USER | NEED_WRITE},
-/* 0x02 */ { "SMBopen",reply_open,AS_USER | QUEUE_IN_OPLOCK },
+/* 0x02 */ { "SMBopen",reply_open,AS_USER },
 /* 0x03 */ { "SMBcreate",reply_mknew,AS_USER},
 /* 0x04 */ { "SMBclose",reply_close,AS_USER | CAN_IPC },
 /* 0x05 */ { "SMBflush",reply_flush,AS_USER},
-/* 0x06 */ { "SMBunlink",reply_unlink,AS_USER | NEED_WRITE | QUEUE_IN_OPLOCK},
-/* 0x07 */ { "SMBmv",reply_mv,AS_USER | NEED_WRITE | QUEUE_IN_OPLOCK},
+/* 0x06 */ { "SMBunlink",reply_unlink,AS_USER | NEED_WRITE }, 
+/* 0x07 */ { "SMBmv",reply_mv,AS_USER | NEED_WRITE },
 /* 0x08 */ { "SMBgetatr",reply_getatr,AS_USER},
 /* 0x09 */ { "SMBsetatr",reply_setatr,AS_USER | NEED_WRITE},
 /* 0x0a */ { "SMBread",reply_read,AS_USER},
 /* 0x0b */ { "SMBwrite",reply_write,AS_USER | CAN_IPC },
 /* 0x0c */ { "SMBlock",reply_lock,AS_USER},
 /* 0x0d */ { "SMBunlock",reply_unlock,AS_USER},
-/* 0x0e */ { "SMBctemp",reply_ctemp,AS_USER | QUEUE_IN_OPLOCK },
+/* 0x0e */ { "SMBctemp",reply_ctemp,AS_USER },
 /* 0x0f */ { "SMBmknew",reply_mknew,AS_USER}, 
 /* 0x10 */ { "SMBchkpth",reply_chkpth,AS_USER},
-/* 0x11 */ { "SMBexit",reply_exit,0},
+/* 0x11 */ { "SMBexit",reply_exit,DO_CHDIR},
 /* 0x12 */ { "SMBlseek",reply_lseek,AS_USER},
 /* 0x13 */ { "SMBlockread",reply_lockread,AS_USER},
 /* 0x14 */ { "SMBwriteunlock",reply_writeunlock,AS_USER},
@@ -390,11 +704,11 @@ const static struct smb_message_struct
 /* 0x26 */ { "SMBtranss",NULL,AS_USER | CAN_IPC},
 /* 0x27 */ { "SMBioctl",reply_ioctl,0},
 /* 0x28 */ { "SMBioctls",NULL,AS_USER},
-/* 0x29 */ { "SMBcopy",reply_copy,AS_USER | NEED_WRITE | QUEUE_IN_OPLOCK },
-/* 0x2a */ { "SMBmove",NULL,AS_USER | NEED_WRITE | QUEUE_IN_OPLOCK },
+/* 0x29 */ { "SMBcopy",reply_copy,AS_USER | NEED_WRITE },
+/* 0x2a */ { "SMBmove",NULL,AS_USER | NEED_WRITE },
 /* 0x2b */ { "SMBecho",reply_echo,0},
 /* 0x2c */ { "SMBwriteclose",reply_writeclose,AS_USER},
-/* 0x2d */ { "SMBopenX",reply_open_and_X,AS_USER | CAN_IPC | QUEUE_IN_OPLOCK },
+/* 0x2d */ { "SMBopenX",reply_open_and_X,AS_USER | CAN_IPC },
 /* 0x2e */ { "SMBreadX",reply_read_and_X,AS_USER | CAN_IPC },
 /* 0x2f */ { "SMBwriteX",reply_write_and_X,AS_USER | CAN_IPC },
 /* 0x30 */ { NULL, NULL, 0 },
@@ -462,7 +776,7 @@ const static struct smb_message_struct
 /* 0x6e */ { NULL, NULL, 0 },
 /* 0x6f */ { NULL, NULL, 0 },
 /* 0x70 */ { "SMBtcon",reply_tcon,0},
-/* 0x71 */ { "SMBtdis",reply_tdis,0},
+/* 0x71 */ { "SMBtdis",reply_tdis,DO_CHDIR},
 /* 0x72 */ { "SMBnegprot",reply_negprot,0},
 /* 0x73 */ { "SMBsesssetupX",reply_sesssetup_and_X,0},
 /* 0x74 */ { "SMBulogoffX", reply_ulogoffX, 0}, /* ulogoff doesn't give a valid TID */
@@ -509,12 +823,12 @@ const static struct smb_message_struct
 /* 0x9d */ { NULL, NULL, 0 },
 /* 0x9e */ { NULL, NULL, 0 },
 /* 0x9f */ { NULL, NULL, 0 },
-/* 0xa0 */ { "SMBnttrans", reply_nttrans, AS_USER | CAN_IPC | QUEUE_IN_OPLOCK},
+/* 0xa0 */ { "SMBnttrans", reply_nttrans, AS_USER | CAN_IPC },
 /* 0xa1 */ { "SMBnttranss", reply_nttranss, AS_USER | CAN_IPC },
-/* 0xa2 */ { "SMBntcreateX", reply_ntcreate_and_X, AS_USER | CAN_IPC | QUEUE_IN_OPLOCK },
+/* 0xa2 */ { "SMBntcreateX", reply_ntcreate_and_X, AS_USER | CAN_IPC },
 /* 0xa3 */ { NULL, NULL, 0 },
 /* 0xa4 */ { "SMBntcancel", reply_ntcancel, 0 },
-/* 0xa5 */ { NULL, NULL, 0 },
+/* 0xa5 */ { "SMBntrename", reply_ntrename, AS_USER | NEED_WRITE },
 /* 0xa6 */ { NULL, NULL, 0 },
 /* 0xa7 */ { NULL, NULL, 0 },
 /* 0xa8 */ { NULL, NULL, 0 },
@@ -541,7 +855,7 @@ const static struct smb_message_struct
 /* 0xbd */ { NULL, NULL, 0 },
 /* 0xbe */ { NULL, NULL, 0 },
 /* 0xbf */ { NULL, NULL, 0 },
-/* 0xc0 */ { "SMBsplopen",reply_printopen,AS_USER | QUEUE_IN_OPLOCK },
+/* 0xc0 */ { "SMBsplopen",reply_printopen,AS_USER},
 /* 0xc1 */ { "SMBsplwr",reply_printwrite,AS_USER},
 /* 0xc2 */ { "SMBsplclose",reply_printclose,AS_USER},
 /* 0xc3 */ { "SMBsplretq",reply_printqueue,AS_USER},
@@ -630,7 +944,7 @@ static void smb_dump(const char *name, int type, char *data, ssize_t len)
                if (ret != len)
                        DEBUG(0,("smb_dump: problem: write returned %d\n", (int)ret ));
                close(fd);
-               DEBUG(0,("created %s len %d\n", fname, len));
+               DEBUG(0,("created %s len %lu\n", fname, (unsigned long)len));
        }
 }
 
@@ -643,7 +957,6 @@ static int switch_message(int type,char *inbuf,char *outbuf,int size,int bufsize
 {
        static pid_t pid= (pid_t)-1;
        int outsize = 0;
-       extern uint16 global_smbpid;
 
        type &= 0xff;
 
@@ -651,6 +964,8 @@ static int switch_message(int type,char *inbuf,char *outbuf,int size,int bufsize
                pid = sys_getpid();
 
        errno = 0;
+       set_saved_ntstatus(NT_STATUS_OK);
+
        last_message = type;
 
        /* Make sure this is an SMB packet. smb_size contains NetBIOS header so subtract 4 from it. */
@@ -675,22 +990,9 @@ static int switch_message(int type,char *inbuf,char *outbuf,int size,int bufsize
                uint16 session_tag = (lp_security() == SEC_SHARE) ? UID_FIELD_INVALID : SVAL(inbuf,smb_uid);
                connection_struct *conn = conn_find(SVAL(inbuf,smb_tid));
 
-               DEBUG(3,("switch message %s (pid %d)\n",smb_fn_name(type),(int)pid));
+               DEBUG(3,("switch message %s (pid %d) conn 0x%lx\n",smb_fn_name(type),(int)pid,(unsigned long)conn));
 
                smb_dump(smb_fn_name(type), 1, inbuf, size);
-               if(global_oplock_break) {
-                       if(flags & QUEUE_IN_OPLOCK) {
-                               /* 
-                                * Queue this message as we are the process of an oplock break.
-                                */
-
-                               DEBUG( 2, ( "switch_message: queueing message due to being in " ) );
-                               DEBUGADD( 2, ( "oplock break state.\n" ) );
-
-                               push_oplock_pending_smb_message( inbuf, size );
-                               return -1;
-                       }
-               }
 
                /* Ensure this value is replaced in the incoming packet. */
                SSVAL(inbuf,smb_uid,session_tag);
@@ -712,7 +1014,7 @@ static int switch_message(int type,char *inbuf,char *outbuf,int size,int bufsize
                        if(session_tag != UID_FIELD_INVALID)
                                vuser = get_valid_user_struct(session_tag);           
                        if(vuser != NULL)
-                               current_user_info = vuser->user;
+                               set_current_user_info(&vuser->user);
                }
 
                /* does this protocol need to be run as root? */
@@ -720,8 +1022,14 @@ static int switch_message(int type,char *inbuf,char *outbuf,int size,int bufsize
                        change_to_root_user();
 
                /* does this protocol need a valid tree connection? */
-               if ((flags & AS_USER) && !conn)
-                       return ERROR_DOS(ERRSRV, ERRinvnid);
+               if ((flags & AS_USER) && !conn) {
+                       /* Amazingly, the error code depends on the command (from Samba4). */
+                       if (type == SMBntcreateX) {
+                               return ERROR_NT(NT_STATUS_INVALID_HANDLE);
+                       } else {
+                               return ERROR_DOS(ERRSRV, ERRinvnid);
+                       }
+               }
 
 
                /* does this protocol need to be run as the connected user? */
@@ -729,7 +1037,7 @@ static int switch_message(int type,char *inbuf,char *outbuf,int size,int bufsize
                        if (flags & AS_GUEST) 
                                flags &= ~AS_USER;
                        else
-                               return(ERROR_DOS(ERRSRV,ERRaccess));
+                               return(ERROR_FORCE_DOS(ERRSRV,ERRbaduid));
                }
 
                /* this code is to work around a bug is MS client 3 without
@@ -747,16 +1055,19 @@ static int switch_message(int type,char *inbuf,char *outbuf,int size,int bufsize
                        return(ERROR_DOS(ERRSRV,ERRaccess));        
 
                /* load service specific parameters */
-               if (conn && !set_current_service(conn,(flags & AS_USER)?True:False))
-                       return(ERROR_DOS(ERRSRV,ERRaccess));
+               if (conn) {
+                       if (!set_current_service(conn,SVAL(inbuf,smb_flg),(flags & (AS_USER|DO_CHDIR)?True:False))) {
+                               return(ERROR_DOS(ERRSRV,ERRaccess));
+                       }
+                       conn->num_smb_operations++;
+               }
 
                /* does this protocol need to be run as guest? */
                if ((flags & AS_GUEST) && (!change_to_guest() || 
                                !check_access(smbd_server_fd(), lp_hostsallow(-1), lp_hostsdeny(-1))))
                        return(ERROR_DOS(ERRSRV,ERRaccess));
 
-               last_inbuf = inbuf;
-
+               current_inbuf = inbuf; /* In case we need to defer this message in open... */
                outsize = smb_messages[type].fn(conn, inbuf,outbuf,size,bufsize);
        }
 
@@ -801,6 +1112,32 @@ static int construct_reply(char *inbuf,char *outbuf,int size,int bufsize)
  'hard' limit Samba overhead on resource constrained systems. 
 ****************************************************************************/
 
+static BOOL process_count_update_successful = False;
+
+static int32 increment_smbd_process_count(void)
+{
+       int32 total_smbds;
+
+       if (lp_max_smbd_processes()) {
+               total_smbds = 0;
+               if (tdb_change_int32_atomic(conn_tdb_ctx(), "INFO/total_smbds", &total_smbds, 1) == -1)
+                       return 1;
+               process_count_update_successful = True;
+               return total_smbds + 1;
+       }
+       return 1;
+}
+
+void decrement_smbd_process_count(void)
+{
+       int32 total_smbds;
+
+       if (lp_max_smbd_processes() && process_count_update_successful) {
+               total_smbds = 1;
+               tdb_change_int32_atomic(conn_tdb_ctx(), "INFO/total_smbds", &total_smbds, -1);
+       }
+}
+
 static BOOL smbd_process_limit(void)
 {
        int32  total_smbds;
@@ -811,17 +1148,13 @@ static BOOL smbd_process_limit(void)
                 * subtracts one.
                 */
 
-               total_smbds = 1; /* In case we need to create the entry. */
-
                if (!conn_tdb_ctx()) {
                        DEBUG(0,("smbd_process_limit: max smbd processes parameter set with status parameter not \
 set. Ignoring max smbd restriction.\n"));
                        return False;
                }
 
-               if (tdb_change_int32_atomic(conn_tdb_ctx(), "INFO/total_smbds", &total_smbds, 1) == -1)
-                       return True;
-
+               total_smbds = increment_smbd_process_count();
                return total_smbds > lp_max_smbd_processes();
        }
        else
@@ -829,70 +1162,65 @@ set. Ignoring max smbd restriction.\n"));
 }
 
 /****************************************************************************
 process an smb from the client - split out from the smbd_process() code so
 it can be used by the oplock break code.
Process an smb from the client - split out from the smbd_process() code so
+ it can be used by the oplock break code.
 ****************************************************************************/
+
 void process_smb(char *inbuf, char *outbuf)
 {
-  static int trans_num;
-  int msg_type = CVAL(inbuf,0);
-  int32 len = smb_len(inbuf);
-  int nread = len + 4;
-
-  DO_PROFILE_INC(smb_count);
-
-  if (trans_num == 0) {
-         /* on the first packet, check the global hosts allow/ hosts
-            deny parameters before doing any parsing of the packet
-            passed to us by the client.  This prevents attacks on our
-            parsing code from hosts not in the hosts allow list */
-         if (smbd_process_limit() ||
-                 !check_access(smbd_server_fd(), lp_hostsallow(-1), lp_hostsdeny(-1))) {
-                 /* send a negative session response "not listening on calling
-                  name" */
-                 static unsigned char buf[5] = {0x83, 0, 0, 1, 0x81};
-                 DEBUG( 1, ( "Connection denied from %s\n",
-                             client_addr() ) );
-                 (void)send_smb(smbd_server_fd(),(char *)buf);
-                 exit_server("connection denied");
-         }
-  }
-
-  DEBUG( 6, ( "got message type 0x%x of len 0x%x\n", msg_type, len ) );
-  DEBUG( 3, ( "Transaction %d of length %d\n", trans_num, nread ) );
-
-  if (msg_type == 0)
-    show_msg(inbuf);
-  else if(msg_type == SMBkeepalive)
-    return; /* Keepalive packet. */
-
-  nread = construct_reply(inbuf,outbuf,nread,max_send);
+       static int trans_num;
+       int msg_type = CVAL(inbuf,0);
+       int32 len = smb_len(inbuf);
+       int nread = len + 4;
+
+       DO_PROFILE_INC(smb_count);
+
+       if (trans_num == 0) {
+               /* on the first packet, check the global hosts allow/ hosts
+               deny parameters before doing any parsing of the packet
+               passed to us by the client.  This prevents attacks on our
+               parsing code from hosts not in the hosts allow list */
+               if (smbd_process_limit() ||
+                               !check_access(smbd_server_fd(), lp_hostsallow(-1), lp_hostsdeny(-1))) {
+                       /* send a negative session response "not listening on calling name" */
+                       static unsigned char buf[5] = {0x83, 0, 0, 1, 0x81};
+                       DEBUG( 1, ( "Connection denied from %s\n", client_addr() ) );
+                       (void)send_smb(smbd_server_fd(),(char *)buf);
+                       exit_server("connection denied");
+               }
+       }
+
+       DEBUG( 6, ( "got message type 0x%x of len 0x%x\n", msg_type, len ) );
+       DEBUG( 3, ( "Transaction %d of length %d\n", trans_num, nread ) );
+
+       if (msg_type == 0)
+               show_msg(inbuf);
+       else if(msg_type == SMBkeepalive)
+               return; /* Keepalive packet. */
+
+       nread = construct_reply(inbuf,outbuf,nread,max_send);
       
-  if(nread > 0) 
-  {
-    if (CVAL(outbuf,0) == 0)
-      show_msg(outbuf);
+       if(nread > 0) {
+               if (CVAL(outbuf,0) == 0)
+                       show_msg(outbuf);
        
-    if (nread != smb_len(outbuf) + 4) 
-    {
-      DEBUG(0,("ERROR: Invalid message response size! %d %d\n",
-                 nread, smb_len(outbuf)));
-    }
-    else
-      if (!send_smb(smbd_server_fd(),outbuf))
-        exit_server("process_smb: send_smb failed.");
-  }
-  trans_num++;
+               if (nread != smb_len(outbuf) + 4) {
+                       DEBUG(0,("ERROR: Invalid message response size! %d %d\n",
+                               nread, smb_len(outbuf)));
+               } else if (!send_smb(smbd_server_fd(),outbuf)) {
+                       exit_server("process_smb: send_smb failed.");
+               }
+       }
+       trans_num++;
 }
 
-
-
 /****************************************************************************
-return a string containing the function name of a SMB command
+ Return a string containing the function name of a SMB command.
 ****************************************************************************/
+
 const char *smb_fn_name(int type)
 {
-       static char *unknown_name = "SMBunknown";
+       const char *unknown_name = "SMBunknown";
 
        if (smb_messages[type].name == NULL)
                return(unknown_name);
@@ -900,11 +1228,22 @@ const char *smb_fn_name(int type)
        return(smb_messages[type].name);
 }
 
-
 /****************************************************************************
- Helper function for contruct_reply.
+ Helper functions for contruct_reply.
 ****************************************************************************/
 
+static uint32 common_flags2 = FLAGS2_LONG_PATH_COMPONENTS|FLAGS2_32_BIT_ERROR_CODES;
+
+void add_to_common_flags2(uint32 v)
+{
+       common_flags2 |= v;
+}
+
+void remove_from_common_flags2(uint32 v)
+{
+       common_flags2 &= ~v;
+}
+
 void construct_reply_common(char *inbuf,char *outbuf)
 {
        memset(outbuf,'\0',smb_size);
@@ -917,9 +1256,8 @@ void construct_reply_common(char *inbuf,char *outbuf)
        SCVAL(outbuf,smb_reh,0);
        SCVAL(outbuf,smb_flg, FLAG_REPLY | (CVAL(inbuf,smb_flg) & FLAG_CASELESS_PATHNAMES)); 
        SSVAL(outbuf,smb_flg2,
-             (SVAL(inbuf,smb_flg2) & FLAGS2_UNICODE_STRINGS) |
-             FLAGS2_LONG_PATH_COMPONENTS |
-             FLAGS2_32_BIT_ERROR_CODES | FLAGS2_EXTENDED_SECURITY);
+               (SVAL(inbuf,smb_flg2) & FLAGS2_UNICODE_STRINGS) |
+               common_flags2);
 
        SSVAL(outbuf,smb_err,SMB_SUCCESS);
        SSVAL(outbuf,smb_tid,SVAL(inbuf,smb_tid));
@@ -929,92 +1267,93 @@ void construct_reply_common(char *inbuf,char *outbuf)
 }
 
 /****************************************************************************
-  construct a chained reply and add it to the already made reply
-  **************************************************************************/
+ Construct a chained reply and add it to the already made reply
+****************************************************************************/
+
 int chain_reply(char *inbuf,char *outbuf,int size,int bufsize)
 {
-  static char *orig_inbuf;
-  static char *orig_outbuf;
-  int smb_com1, smb_com2 = CVAL(inbuf,smb_vwv0);
-  unsigned smb_off2 = SVAL(inbuf,smb_vwv1);
-  char *inbuf2, *outbuf2;
-  int outsize2;
-  char inbuf_saved[smb_wct];
-  char outbuf_saved[smb_wct];
-  int wct = CVAL(outbuf,smb_wct);
-  int outsize = smb_size + 2*wct + SVAL(outbuf,smb_vwv0+2*wct);
-
-  /* maybe its not chained */
-  if (smb_com2 == 0xFF) {
-    SCVAL(outbuf,smb_vwv0,0xFF);
-    return outsize;
-  }
-
-  if (chain_size == 0) {
-    /* this is the first part of the chain */
-    orig_inbuf = inbuf;
-    orig_outbuf = outbuf;
-  }
-
-  /*
-   * The original Win95 redirector dies on a reply to
-   * a lockingX and read chain unless the chain reply is
-   * 4 byte aligned. JRA.
-   */
-
-  outsize = (outsize + 3) & ~3;
-
-  /* we need to tell the client where the next part of the reply will be */
-  SSVAL(outbuf,smb_vwv1,smb_offset(outbuf+outsize,outbuf));
-  SCVAL(outbuf,smb_vwv0,smb_com2);
-
-  /* remember how much the caller added to the chain, only counting stuff
-     after the parameter words */
-  chain_size += outsize - smb_wct;
-
-  /* work out pointers into the original packets. The
-     headers on these need to be filled in */
-  inbuf2 = orig_inbuf + smb_off2 + 4 - smb_wct;
-  outbuf2 = orig_outbuf + SVAL(outbuf,smb_vwv1) + 4 - smb_wct;
-
-  /* remember the original command type */
-  smb_com1 = CVAL(orig_inbuf,smb_com);
-
-  /* save the data which will be overwritten by the new headers */
-  memcpy(inbuf_saved,inbuf2,smb_wct);
-  memcpy(outbuf_saved,outbuf2,smb_wct);
-
-  /* give the new packet the same header as the last part of the SMB */
-  memmove(inbuf2,inbuf,smb_wct);
-
-  /* create the in buffer */
-  SCVAL(inbuf2,smb_com,smb_com2);
-
-  /* create the out buffer */
-  construct_reply_common(inbuf2, outbuf2);
-
-  DEBUG(3,("Chained message\n"));
-  show_msg(inbuf2);
-
-  /* process the request */
-  outsize2 = switch_message(smb_com2,inbuf2,outbuf2,size-chain_size,
-                           bufsize-chain_size);
-
-  /* copy the new reply and request headers over the old ones, but
-     preserve the smb_com field */
-  memmove(orig_outbuf,outbuf2,smb_wct);
-  SCVAL(orig_outbuf,smb_com,smb_com1);
-
-  /* restore the saved data, being careful not to overwrite any
-   data from the reply header */
-  memcpy(inbuf2,inbuf_saved,smb_wct);
-  {
-    int ofs = smb_wct - PTR_DIFF(outbuf2,orig_outbuf);
-    if (ofs < 0) ofs = 0;
-    memmove(outbuf2+ofs,outbuf_saved+ofs,smb_wct-ofs);
-  }
-
-  return outsize2;
+       static char *orig_inbuf;
+       static char *orig_outbuf;
+       int smb_com1, smb_com2 = CVAL(inbuf,smb_vwv0);
+       unsigned smb_off2 = SVAL(inbuf,smb_vwv1);
+       char *inbuf2, *outbuf2;
+       int outsize2;
+       char inbuf_saved[smb_wct];
+       char outbuf_saved[smb_wct];
+       int outsize = smb_len(outbuf) + 4;
+
+       /* maybe its not chained */
+       if (smb_com2 == 0xFF) {
+               SCVAL(outbuf,smb_vwv0,0xFF);
+               return outsize;
+       }
+
+       if (chain_size == 0) {
+               /* this is the first part of the chain */
+               orig_inbuf = inbuf;
+               orig_outbuf = outbuf;
+       }
+
+       /*
+        * The original Win95 redirector dies on a reply to
+        * a lockingX and read chain unless the chain reply is
+        * 4 byte aligned. JRA.
+        */
+
+       outsize = (outsize + 3) & ~3;
+
+       /* we need to tell the client where the next part of the reply will be */
+       SSVAL(outbuf,smb_vwv1,smb_offset(outbuf+outsize,outbuf));
+       SCVAL(outbuf,smb_vwv0,smb_com2);
+
+       /* remember how much the caller added to the chain, only counting stuff
+               after the parameter words */
+       chain_size += outsize - smb_wct;
+
+       /* work out pointers into the original packets. The
+               headers on these need to be filled in */
+       inbuf2 = orig_inbuf + smb_off2 + 4 - smb_wct;
+       outbuf2 = orig_outbuf + SVAL(outbuf,smb_vwv1) + 4 - smb_wct;
+
+       /* remember the original command type */
+       smb_com1 = CVAL(orig_inbuf,smb_com);
+
+       /* save the data which will be overwritten by the new headers */
+       memcpy(inbuf_saved,inbuf2,smb_wct);
+       memcpy(outbuf_saved,outbuf2,smb_wct);
+
+       /* give the new packet the same header as the last part of the SMB */
+       memmove(inbuf2,inbuf,smb_wct);
+
+       /* create the in buffer */
+       SCVAL(inbuf2,smb_com,smb_com2);
+
+       /* create the out buffer */
+       construct_reply_common(inbuf2, outbuf2);
+
+       DEBUG(3,("Chained message\n"));
+       show_msg(inbuf2);
+
+       /* process the request */
+       outsize2 = switch_message(smb_com2,inbuf2,outbuf2,size-chain_size,
+                               bufsize-chain_size);
+
+       /* copy the new reply and request headers over the old ones, but
+               preserve the smb_com field */
+       memmove(orig_outbuf,outbuf2,smb_wct);
+       SCVAL(orig_outbuf,smb_com,smb_com1);
+
+       /* restore the saved data, being careful not to overwrite any
+               data from the reply header */
+       memcpy(inbuf2,inbuf_saved,smb_wct);
+
+       {
+               int ofs = smb_wct - PTR_DIFF(outbuf2,orig_outbuf);
+               if (ofs < 0) ofs = 0;
+                       memmove(outbuf2+ofs,outbuf_saved+ofs,smb_wct-ofs);
+       }
+
+       return outsize2;
 }
 
 /****************************************************************************
@@ -1030,6 +1369,7 @@ static int setup_select_timeout(void)
        select_timeout *= 1000;
 
        t = change_notify_timeout();
+       DEBUG(10, ("change_notify_timeout: %d\n", t));
        if (t != -1)
                select_timeout = MIN(select_timeout, t*1000);
 
@@ -1043,19 +1383,53 @@ static int setup_select_timeout(void)
  Check if services need reloading.
 ****************************************************************************/
 
-void check_reload(int t)
+void check_reload(time_t t)
 {
-  static time_t last_smb_conf_reload_time = 0;
+       static pid_t mypid = 0;
+       static time_t last_smb_conf_reload_time = 0;
+       static time_t last_printer_reload_time = 0;
+       time_t printcap_cache_time = (time_t)lp_printcap_cache_time();
+
+       if(last_smb_conf_reload_time == 0) {
+               last_smb_conf_reload_time = t;
+               /* Our printing subsystem might not be ready at smbd start up.
+                  Then no printer is available till the first printers check
+                  is performed.  A lower initial interval circumvents this. */
+               if ( printcap_cache_time > 60 )
+                       last_printer_reload_time = t - printcap_cache_time + 60;
+               else
+                       last_printer_reload_time = t;
+       }
 
-  if(last_smb_conf_reload_time == 0)
-    last_smb_conf_reload_time = t;
+       if (mypid != getpid()) { /* First time or fork happened meanwhile */
+               /* randomize over 60 second the printcap reload to avoid all
+                * process hitting cupsd at the same time */
+               int time_range = 60;
 
-  if (reload_after_sighup || (t >= last_smb_conf_reload_time+SMBD_RELOAD_CHECK))
-  {
-    reload_services(True);
-    reload_after_sighup = False;
-    last_smb_conf_reload_time = t;
-  }
+               last_printer_reload_time += random() % time_range;
+               mypid = getpid();
+       }
+
+       if (reload_after_sighup || (t >= last_smb_conf_reload_time+SMBD_RELOAD_CHECK)) {
+               reload_services(True);
+               reload_after_sighup = False;
+               last_smb_conf_reload_time = t;
+       }
+
+       /* 'printcap cache time = 0' disable the feature */
+       
+       if ( printcap_cache_time != 0 )
+       { 
+               /* see if it's time to reload or if the clock has been set back */
+               
+               if ( (t >= last_printer_reload_time+printcap_cache_time) 
+                       || (t-last_printer_reload_time  < 0) ) 
+               {
+                       DEBUG( 3,( "Printcap cache time expired.\n"));
+                       reload_printers();
+                       last_printer_reload_time = t;
+               }
+       }
 }
 
 /****************************************************************************
@@ -1064,163 +1438,268 @@ void check_reload(int t)
 
 static BOOL timeout_processing(int deadtime, int *select_timeout, time_t *last_timeout_processing_time)
 {
-  static time_t last_keepalive_sent_time = 0;
-  static time_t last_idle_closed_check = 0;
-  time_t t;
-  BOOL allidle = True;
-  extern int keepalive;
-
-  if (smb_read_error == READ_EOF) 
-  {
-    DEBUG(3,("end of file from client\n"));
-    return False;
-  }
-
-  if (smb_read_error == READ_ERROR) 
-  {
-    DEBUG(3,("receive_smb error (%s) exiting\n",
-              strerror(errno)));
-    return False;
-  }
-
-  *last_timeout_processing_time = t = time(NULL);
-
-  if(last_keepalive_sent_time == 0)
-    last_keepalive_sent_time = t;
-
-  if(last_idle_closed_check == 0)
-    last_idle_closed_check = t;
-
-  /* become root again if waiting */
-  change_to_root_user();
-
-  /* check if we need to reload services */
-  check_reload(t);
-
-  /* automatic timeout if all connections are closed */      
-  if (conn_num_open()==0 && (t - last_idle_closed_check) >= IDLE_CLOSED_TIMEOUT) 
-  {
-    DEBUG( 2, ( "Closing idle connection\n" ) );
-    return False;
-  }
-  else
-    last_idle_closed_check = t;
-
-  if (keepalive && (t - last_keepalive_sent_time)>keepalive) 
-  {
-         extern struct auth_context *negprot_global_auth_context;
-         if (!send_keepalive(smbd_server_fd())) {
-                 DEBUG( 2, ( "Keepalive failed - exiting.\n" ) );
-                 return False;
-         }
-         
-         /* send a keepalive for a password server or the like.
-            This is attached to the auth_info created in the
-            negprot */
-         if (negprot_global_auth_context 
-             && negprot_global_auth_context->challenge_set_method 
-             && negprot_global_auth_context->challenge_set_method->send_keepalive) {
-                 negprot_global_auth_context->challenge_set_method->send_keepalive
-                         (&negprot_global_auth_context->challenge_set_method->private_data);
-         }
-
-         last_keepalive_sent_time = t;
-  }
-
-  /* check for connection timeouts */
-  allidle = conn_idle_all(t, deadtime);
-
-  if (allidle && conn_num_open()>0) {
-    DEBUG(2,("Closing idle connection 2.\n"));
-    return False;
-  }
-
-  if(global_machine_password_needs_changing && 
-     /* for ADS we need to do a regular ADS password change, not a domain
-        password change */
-     lp_security() == SEC_DOMAIN)
-  {
-    unsigned char trust_passwd_hash[16];
-    time_t lct;
-    pstring remote_machine_list;
-
-    /*
-     * We're in domain level security, and the code that
-     * read the machine password flagged that the machine
-     * password needs changing.
-     */
-
-    /*
-     * First, open the machine password file with an exclusive lock.
-     */
-
-    if(!secrets_fetch_trust_account_password(global_myworkgroup, trust_passwd_hash, &lct)) {
-      DEBUG(0,("process: unable to read the machine account password for \
-machine %s in domain %s.\n", global_myname, global_myworkgroup ));
-      return True;
-    }
-
-    /*
-     * Make sure someone else hasn't already done this.
-     */
-
-    if(t < lct + lp_machine_password_timeout()) {
-      global_machine_password_needs_changing = False;
-      return True;
-    }
-
-    pstrcpy(remote_machine_list, lp_passwordserver());
-
-    change_trust_account_password( global_myworkgroup, remote_machine_list);
-    global_machine_password_needs_changing = False;
-  }
-
-  /*
-   * Check to see if we have any blocking locks
-   * outstanding on the queue.
-   */
-  process_blocking_lock_queue(t);
-
-  /*
-   * Check to see if we have any change notifies 
-   * outstanding on the queue.
-   */
-  process_pending_change_notify_queue(t);
-
-  /*
-   * Now we are root, check if the log files need pruning.
-   * Force a log file check.
-   */
-  force_check_log_size();
-  check_log_size();
-
-  /* Send any queued printer notify message to interested smbd's. */
-
-  print_notify_send_messages();
-
-  /*
-   * Modify the select timeout depending upon
-   * what we have remaining in our queues.
-   */
-
-  *select_timeout = setup_select_timeout();
-
-  return True;
+       static time_t last_keepalive_sent_time = 0;
+       static time_t last_idle_closed_check = 0;
+       time_t t;
+       BOOL allidle = True;
+
+       if (smb_read_error == READ_EOF) {
+               DEBUG(3,("timeout_processing: End of file from client (client has disconnected).\n"));
+               return False;
+       }
+
+       if (smb_read_error == READ_ERROR) {
+               DEBUG(3,("timeout_processing: receive_smb error (%s) Exiting\n",
+                       strerror(errno)));
+               return False;
+       }
+
+       if (smb_read_error == READ_BAD_SIG) {
+               DEBUG(3,("timeout_processing: receive_smb error bad smb signature. Exiting\n"));
+               return False;
+       }
+
+       *last_timeout_processing_time = t = time(NULL);
+
+       if(last_keepalive_sent_time == 0)
+               last_keepalive_sent_time = t;
+
+       if(last_idle_closed_check == 0)
+               last_idle_closed_check = t;
+
+       /* become root again if waiting */
+       change_to_root_user();
+
+       /* run all registered idle events */
+       smb_run_idle_events(t);
+
+       /* check if we need to reload services */
+       check_reload(t);
+
+       /* automatic timeout if all connections are closed */      
+       if (conn_num_open()==0 && (t - last_idle_closed_check) >= IDLE_CLOSED_TIMEOUT) {
+               DEBUG( 2, ( "Closing idle connection\n" ) );
+               return False;
+       } else {
+               last_idle_closed_check = t;
+       }
+
+       if (keepalive && (t - last_keepalive_sent_time)>keepalive) {
+               if (!send_keepalive(smbd_server_fd())) {
+                       DEBUG( 2, ( "Keepalive failed - exiting.\n" ) );
+                       return False;
+               }
+
+               /* send a keepalive for a password server or the like.
+                       This is attached to the auth_info created in the
+               negprot */
+               if (negprot_global_auth_context && negprot_global_auth_context->challenge_set_method 
+                               && negprot_global_auth_context->challenge_set_method->send_keepalive) {
+
+                       negprot_global_auth_context->challenge_set_method->send_keepalive
+                       (&negprot_global_auth_context->challenge_set_method->private_data);
+               }
+
+               last_keepalive_sent_time = t;
+       }
+
+       /* check for connection timeouts */
+       allidle = conn_idle_all(t, deadtime);
+
+       if (allidle && conn_num_open()>0) {
+               DEBUG(2,("Closing idle connection 2.\n"));
+               return False;
+       }
+
+       if(global_machine_password_needs_changing && 
+                       /* for ADS we need to do a regular ADS password change, not a domain
+                                       password change */
+                       lp_security() == SEC_DOMAIN) {
+
+               unsigned char trust_passwd_hash[16];
+               time_t lct;
+
+               /*
+                * We're in domain level security, and the code that
+                * read the machine password flagged that the machine
+                * password needs changing.
+                */
+
+               /*
+                * First, open the machine password file with an exclusive lock.
+                */
+
+               if (secrets_lock_trust_account_password(lp_workgroup(), True) == False) {
+                       DEBUG(0,("process: unable to lock the machine account password for \
+machine %s in domain %s.\n", global_myname(), lp_workgroup() ));
+                       return True;
+               }
+
+               if(!secrets_fetch_trust_account_password(lp_workgroup(), trust_passwd_hash, &lct, NULL)) {
+                       DEBUG(0,("process: unable to read the machine account password for \
+machine %s in domain %s.\n", global_myname(), lp_workgroup()));
+                       secrets_lock_trust_account_password(lp_workgroup(), False);
+                       return True;
+               }
+
+               /*
+                * Make sure someone else hasn't already done this.
+                */
+
+               if(t < lct + lp_machine_password_timeout()) {
+                       global_machine_password_needs_changing = False;
+                       secrets_lock_trust_account_password(lp_workgroup(), False);
+                       return True;
+               }
+
+               /* always just contact the PDC here */
+    
+               change_trust_account_password( lp_workgroup(), NULL);
+               global_machine_password_needs_changing = False;
+               secrets_lock_trust_account_password(lp_workgroup(), False);
+       }
+
+       /*
+        * Check to see if we have any blocking locks
+        * outstanding on the queue.
+        */
+       process_blocking_lock_queue(t);
+
+       /* update printer queue caches if necessary */
+  
+       update_monitored_printq_cache();
+  
+       /*
+        * Check to see if we have any change notifies 
+        * outstanding on the queue.
+        */
+       process_pending_change_notify_queue(t);
+
+       /*
+        * Now we are root, check if the log files need pruning.
+        * Force a log file check.
+        */
+       force_check_log_size();
+       check_log_size();
+
+       /* Send any queued printer notify message to interested smbd's. */
+
+       print_notify_send_messages(0);
+
+       /*
+        * Modify the select timeout depending upon
+        * what we have remaining in our queues.
+        */
+
+       *select_timeout = setup_select_timeout();
+
+       return True;
+}
+
+/****************************************************************************
+ Accessor functions for InBuffer, OutBuffer.
+****************************************************************************/
+
+char *get_InBuffer(void)
+{
+       return InBuffer;
+}
+
+void set_InBuffer(char *new_inbuf)
+{
+       InBuffer = new_inbuf;
+       current_inbuf = InBuffer;
+}
+
+char *get_OutBuffer(void)
+{
+       return OutBuffer;
+}
+
+void set_OutBuffer(char *new_outbuf)
+{
+       OutBuffer = new_outbuf;
 }
 
 /****************************************************************************
-  process commands from the client
+ Free an InBuffer. Checks if not in use by aio system.
+ Must have been allocated by NewInBuffer.
+****************************************************************************/
+
+void free_InBuffer(char *inbuf)
+{
+       if (!aio_inbuffer_in_use(inbuf)) {
+               if (current_inbuf == inbuf) {
+                       current_inbuf = NULL;
+               }
+               SAFE_FREE(inbuf);
+       }
+}
+
+/****************************************************************************
+ Free an OutBuffer. No outbuffers currently stolen by aio system.
+ Must have been allocated by NewInBuffer.
+****************************************************************************/
+
+void free_OutBuffer(char *outbuf)
+{
+       SAFE_FREE(outbuf);
+}
+
+const int total_buffer_size = (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE + SAFETY_MARGIN);
+
+/****************************************************************************
+ Allocate a new InBuffer. Returns the new and old ones.
+****************************************************************************/
+
+char *NewInBuffer(char **old_inbuf)
+{
+       char *new_inbuf = (char *)SMB_MALLOC(total_buffer_size);
+       if (!new_inbuf) {
+               return NULL;
+       }
+       if (old_inbuf) {
+               *old_inbuf = InBuffer;
+       }
+       InBuffer = new_inbuf;
+#if defined(DEVELOPER)
+       clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, InBuffer, total_buffer_size);
+#endif
+       return InBuffer;
+}
+
+/****************************************************************************
+ Allocate a new OutBuffer. Returns the new and old ones.
+****************************************************************************/
+
+char *NewOutBuffer(char **old_outbuf)
+{
+       char *new_outbuf = (char *)SMB_MALLOC(total_buffer_size);
+       if (!new_outbuf) {
+               return NULL;
+       }
+       if (old_outbuf) {
+               *old_outbuf = OutBuffer;
+       }
+       OutBuffer = new_outbuf;
+#if defined(DEVELOPER)
+       clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, OutBuffer, total_buffer_size);
+#endif
+       return OutBuffer;
+}
+
+/****************************************************************************
+ Process commands from the client
 ****************************************************************************/
 
 void smbd_process(void)
 {
-       extern int smb_echo_count;
        time_t last_timeout_processing_time = time(NULL);
        unsigned int num_smbs = 0;
 
-       InBuffer = (char *)malloc(BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE + SAFETY_MARGIN);
-       OutBuffer = (char *)malloc(BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE + SAFETY_MARGIN);
-       if ((InBuffer == NULL) || (OutBuffer == NULL)) 
+       /* Allocate the primary Inbut/Output buffers. */
+
+       if ((NewInBuffer(NULL) == NULL) || (NewOutBuffer(NULL) == NULL)) 
                return;
 
        max_recv = MIN(lp_maxxmit(),BUFFER_SIZE);
@@ -1239,6 +1718,19 @@ void smbd_process(void)
                lp_talloc_free();
                main_loop_talloc_free();
 
+               /* Did someone ask for immediate checks on things like blocking locks ? */
+               if (select_timeout == 0) {
+                       if(!timeout_processing( deadtime, &select_timeout, &last_timeout_processing_time))
+                               return;
+                       num_smbs = 0; /* Reset smb counter. */
+               }
+
+               run_events();
+
+#if defined(DEVELOPER)
+               clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, InBuffer, total_buffer_size);
+#endif
+
                while (!receive_message_or_smb(InBuffer,BUFFER_SIZE+LARGE_WRITEX_HDR_SIZE,select_timeout)) {
                        if(!timeout_processing( deadtime, &select_timeout, &last_timeout_processing_time))
                                return;
@@ -1256,6 +1748,8 @@ void smbd_process(void)
                 */ 
                num_echos = smb_echo_count;
 
+               clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, OutBuffer, total_buffer_size);
+
                process_smb(InBuffer, OutBuffer);
 
                if (smb_echo_count != num_echos) {
@@ -1282,5 +1776,17 @@ void smbd_process(void)
                                last_timeout_processing_time = new_check_time; /* Reset time. */
                        }
                }
+
+               /* The timeout_processing function isn't run nearly
+                  often enough to implement 'max log size' without
+                  overrunning the size of the file by many megabytes.
+                  This is especially true if we are running at debug
+                  level 10.  Checking every 50 SMBs is a nice
+                  tradeoff of performance vs log file size overrun. */
+
+               if ((num_smbs % 50) == 0 && need_to_check_log_size()) {
+                       change_to_root_user();
+                       check_log_size();
+               }
        }
 }