dir.c: more pstrcpys.

local.h: Add OPLOCK_BREAK_TIMEOUT.
password.c: Fix for paranoia password server security bug.
proto.h: Updated.
reply.c: Oplock changes.
server.c: Massive oplock changes - nearly there....
smb.h: oplock definitions.
util.c: Add local message processing queues for oplocks.
Jeremy (jallison@whistle.com)
(This used to be commit 92f1553db2cdf6f32881eb984a87050cf3e4760b)

1 files changed, 31 insertions, 14 deletions

diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 35f73eab2d..f4d94791cf 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -1504,13 +1504,14 @@ BOOL check_hosts_equiv(char *user)
 
 int password_client = -1;
 static fstring pserver;
+static char *secserver_inbuf = NULL;
 
 /****************************************************************************
 attempted support for server level security 
 ****************************************************************************/
 BOOL server_cryptkey(char *buf)
 {
-  pstring inbuf,outbuf;
+  pstring outbuf;
   fstring pass_protocol;
   extern fstring remote_machine;
   char *p;
@@ -1519,6 +1520,14 @@ BOOL server_cryptkey(char *buf)
   struct in_addr dest_ip;
   int port = SMB_PORT;
   BOOL ret;
+  
+  if(secserver_inbuf == NULL) {
+    secserver_inbuf = (char *)malloc(BUFFER_SIZE + SAFETY_MARGIN);
+    if(secserver_inbuf == NULL) {
+      DEBUG(0,("server_cryptkey: malloc fail for input buffer.\n"));
+      return False;
+    }
+  }
 
   if (password_client >= 0)
     close(password_client);
@@ -1530,7 +1539,7 @@ BOOL server_cryptkey(char *buf)
     strcpy(pass_protocol,"NT LM 0.12");
   }
 
-  bzero(inbuf,sizeof(inbuf));
+  bzero(secserver_inbuf,BUFFER_SIZE + SAFETY_MARGIN);
   bzero(outbuf,sizeof(outbuf));
 
   for (p=strtok(lp_passwordserver(),LIST_SEP); p ; p = strtok(NULL,LIST_SEP)) {
@@ -1596,8 +1605,8 @@ BOOL server_cryptkey(char *buf)
   send_smb(password_client,outbuf);
   
  
-  if (!receive_smb(password_client,inbuf,5000) ||
-      CVAL(inbuf,0) != 0x82) {
+  if (!receive_smb(password_client,secserver_inbuf,5000) ||
+      CVAL(secserver_inbuf,0) != 0x82) {
     DEBUG(1,("%s rejected the session\n",pserver));
     close(password_client); password_client = -1;
     return(False);
@@ -1618,21 +1627,21 @@ BOOL server_cryptkey(char *buf)
   SSVAL(outbuf,smb_flg2,0x1);
 
   send_smb(password_client,outbuf);
-  ret = receive_smb(password_client,inbuf,5000);
+  ret = receive_smb(password_client,secserver_inbuf,5000);
 
-  if (!ret || CVAL(inbuf,smb_rcls) || SVAL(inbuf,smb_vwv0)) {
+  if (!ret || CVAL(secserver_inbuf,smb_rcls) || SVAL(secserver_inbuf,smb_vwv0)) {
     DEBUG(1,("%s rejected the protocol\n",pserver));
     close(password_client); password_client= -1;
     return(False);
   }
 
-  if (!(CVAL(inbuf,smb_vwv1) & 1)) {
+  if (!(CVAL(secserver_inbuf,smb_vwv1) & 1)) {
     DEBUG(1,("%s isn't in user level security mode\n",pserver));
     close(password_client); password_client= -1;
     return(False);
   }
 
-  memcpy(buf,inbuf,smb_len(inbuf)+4);
+  memcpy(buf,secserver_inbuf,smb_len(secserver_inbuf)+4);
 
   DEBUG(3,("password server OK\n"));
 
@@ -1644,15 +1653,23 @@ attempted support for server level security
 ****************************************************************************/
 BOOL server_validate(char *buf)
 {
-  pstring inbuf,outbuf;  
+  pstring outbuf;  
   BOOL ret;
 
+  if(secserver_inbuf == NULL) {
+    secserver_inbuf = (char *)malloc(BUFFER_SIZE + SAFETY_MARGIN);
+    if(secserver_inbuf == NULL) {
+      DEBUG(0,("server_validate: malloc fail for input buffer.\n"));
+      return False;
+    }
+  }
+
   if (password_client < 0) {
     DEBUG(1,("%s not connected\n",pserver));
     return(False);
   }  
 
-  bzero(inbuf,sizeof(inbuf));
+  bzero(secserver_inbuf,BUFFER_SIZE + SAFETY_MARGIN);
   memcpy(outbuf,buf,sizeof(outbuf));
 
   /* send a session setup command */
@@ -1662,18 +1679,18 @@ BOOL server_validate(char *buf)
 
   set_message(outbuf,smb_numwords(outbuf),smb_buflen(outbuf),False);
 
-  SCVAL(inbuf,smb_rcls,1);
+  SCVAL(secserver_inbuf,smb_rcls,1);
 
   send_smb(password_client,outbuf);
-  ret = receive_smb(password_client,inbuf,5000);
+  ret = receive_smb(password_client,secserver_inbuf,5000);
 
-  if (!ret || CVAL(inbuf,smb_rcls) != 0) {
+  if (!ret || CVAL(secserver_inbuf,smb_rcls) != 0) {
     DEBUG(1,("password server %s rejected the password\n",pserver));
     return(False);
   }
 
   /* if logged in as guest then reject */
-  if ((SVAL(inbuf,smb_vwv2) & 1) != 0) {
+  if ((SVAL(secserver_inbuf,smb_vwv2) & 1) != 0) {
     DEBUG(1,("password server %s gave us guest only\n",pserver));
     return(False);
   }