Must set password length to 24 after we encrypt a password.
[samba.git] / source3 / libsmb / clientgen.c
index 9de6afcceef7f76440d33bae44bd658b2f8ede4c..d40c95b9c1c04244c728eb74c1a797063f9814cf 100644 (file)
@@ -19,9 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifdef SYSLOG
-#undef SYSLOG
-#endif
+#define NO_SYSLOG
 
 #include "includes.h"
 #include "trans2.h"
 
 extern int DEBUGLEVEL;
 
+/* 
+ * set the port that will be used for connections by the client
+ */
+
+int cli_set_port(struct cli_state *cli, int port)
+{
+
+       if (port != 0)
+         cli -> port = port;
+
+       return cli -> port;   /* return it incase caller wants it */
+
+}
+
+/****************************************************************************
+recv an smb
+****************************************************************************/
+static BOOL cli_receive_smb(struct cli_state *cli)
+{
+       return client_receive_smb(cli->fd,cli->inbuf,cli->timeout);
+}
+
+/****************************************************************************
+  send an smb to a fd and re-establish if necessary
+****************************************************************************/
+static BOOL cli_send_smb(struct cli_state *cli, BOOL show)
+{
+       size_t len;
+       size_t nwritten=0;
+       ssize_t ret;
+       BOOL reestablished=False;
+
+       if (show)
+       {
+               show_msg(cli->outbuf);
+       }
+
+       len = smb_len(cli->outbuf) + 4;
+
+       while (nwritten < len) {
+               ret = write_socket(cli->fd,cli->outbuf+nwritten,len - nwritten);
+               if (ret <= 0 && errno == EPIPE && !reestablished)
+               {
+                       DEBUG(5,("cli_send_smb: write error (%s) - reconnecting\n",
+                                 strerror(errno)));
+       
+                       if (cli_reestablish_connection(cli)) {
+                               reestablished = True;
+                               nwritten=0;
+                               continue;
+                       }
+               }
+               if (ret <= 0) {
+                       DEBUG(0,("Error writing %d bytes to client. %d. Exiting\n",
+                                len,ret));
+                       return False;
+               }
+               nwritten += ret;
+       }
+       
+       return True;
+}
+
 /*****************************************************
  RAP error codes - a small start but will be extended.
 *******************************************************/
@@ -53,7 +114,7 @@ struct
 /****************************************************************************
   return a description of an SMB error
 ****************************************************************************/
-char *cli_smb_errstr(struct cli_state *cli)
+static char *cli_smb_errstr(struct cli_state *cli)
 {
        return smb_errstr(cli->inbuf);
 }
@@ -65,31 +126,61 @@ char *cli_smb_errstr(struct cli_state *cli)
     
 char *cli_errstr(struct cli_state *cli)
 {   
-  static fstring error_message;
-  int errclass;
-  int errnum;
-  int i;      
-      
-  /*  
-   * Errors are of two kinds - smb errors,
-   * dealt with by cli_smb_errstr, and rap
-   * errors, whose error code is in cli.error.
-   */ 
-
-  cli_error(cli, &errclass, &errnum);
-  if(errclass != 0)
-    return cli_smb_errstr(cli);
-    
-  sprintf(error_message, "code %d", cli->error);
-    
-  for(i = 0; rap_errmap[i].message != NULL; i++) {
-    if (rap_errmap[i].err == cli->error) {
-      fstrcpy( error_message, rap_errmap[i].message);
-      break;
-    }
-  } 
-  
-  return error_message;
+       static fstring error_message;
+       uint8 errclass;
+       uint32 errnum;
+       int i;      
+
+       /*  
+        * Errors are of three kinds - smb errors,
+        * dealt with by cli_smb_errstr, NT errors,
+        * whose code is in cli.nt_error, and rap
+        * errors, whose error code is in cli.rap_error.
+        */ 
+
+       cli_error(cli, &errclass, &errnum);
+
+       if (errclass != 0)
+       {
+               return cli_smb_errstr(cli);
+       }
+
+       /*
+        * Was it an NT error ?
+        */
+
+       if (cli->nt_error)
+       {
+               char *nt_msg = get_nt_error_msg(cli->nt_error);
+
+               if (nt_msg == NULL)
+               {
+                       slprintf(error_message, sizeof(fstring) - 1, "NT code %d", cli->nt_error);
+               }
+               else
+               {
+                       fstrcpy(error_message, nt_msg);
+               }
+
+               return error_message;
+       }
+
+       /*
+        * Must have been a rap error.
+        */
+
+       slprintf(error_message, sizeof(error_message) - 1, "code %d", cli->rap_error);
+
+       for (i = 0; rap_errmap[i].message != NULL; i++)
+       {
+               if (rap_errmap[i].err == cli->rap_error)
+               {
+                       fstrcpy( error_message, rap_errmap[i].message);
+                       break;
+               }
+       } 
+
+       return error_message;
 }
 
 /****************************************************************************
@@ -97,8 +188,10 @@ setup basics in a outgoing packet
 ****************************************************************************/
 static void cli_setup_packet(struct cli_state *cli)
 {
+        cli->rap_error = 0;
+        cli->nt_error = 0;
        SSVAL(cli->outbuf,smb_pid,cli->pid);
-       SSVAL(cli->outbuf,smb_uid,cli->uid);
+       SSVAL(cli->outbuf,smb_uid,cli->vuid);
        SSVAL(cli->outbuf,smb_mid,cli->mid);
        if (cli->protocol > PROTOCOL_CORE) {
                SCVAL(cli->outbuf,smb_flg,0x8);
@@ -107,6 +200,29 @@ static void cli_setup_packet(struct cli_state *cli)
 }
 
 
+/*****************************************************************************
+ Convert a character pointer in a cli_call_api() response to a form we can use.
+ This function contains code to prevent core dumps if the server returns 
+ invalid data.
+*****************************************************************************/
+static char *fix_char_ptr(unsigned int datap, unsigned int converter, 
+                         char *rdata, int rdrcnt)
+{
+       if (datap == 0) {       /* turn NULL pointers into zero length strings */
+               return "";
+       } else {
+               unsigned int offset = datap - converter;
+
+               if (offset >= rdrcnt) {
+                       DEBUG(1,("bad char ptr: datap=%u, converter=%u rdrcnt=%d>",
+                                datap, converter, rdrcnt));
+                       return "<ERROR>";
+               } else {
+                       return &rdata[offset];
+               }
+       }
+}
+
 /****************************************************************************
   send a SMB trans or trans2 request
   ****************************************************************************/
@@ -164,12 +280,11 @@ static BOOL cli_send_trans(struct cli_state *cli, int trans,
        set_message(cli->outbuf,14+lsetup,              /* wcnt, bcc */
                    PTR_DIFF(outdata+this_ldata,smb_buf(cli->outbuf)),False);
 
-       show_msg(cli->outbuf);
-       send_smb(cli->fd,cli->outbuf);
+       cli_send_smb(cli, True);
 
        if (this_ldata < ldata || this_lparam < lparam) {
                /* receive interim response */
-               if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout) || 
+               if (!cli_receive_smb(cli) || 
                    CVAL(cli->inbuf,smb_rcls) != 0) {
                        return(False);
                }      
@@ -205,8 +320,7 @@ static BOOL cli_send_trans(struct cli_state *cli, int trans,
                        set_message(cli->outbuf,trans==SMBtrans?8:9, /* wcnt, bcc */
                                    PTR_DIFF(outdata+this_ldata,smb_buf(cli->outbuf)),False);
                        
-                       show_msg(cli->outbuf);
-                       send_smb(cli->fd,cli->outbuf);
+                       cli_send_smb(cli, True);
                        
                        tot_data += this_ldata;
                        tot_param += this_lparam;
@@ -227,14 +341,14 @@ static BOOL cli_receive_trans(struct cli_state *cli,int trans,
        int total_data=0;
        int total_param=0;
        int this_data,this_param;
+       uint8 eclass;
+       uint32 num;
        
        *data_len = *param_len = 0;
-       
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout))
+
+       if (!cli_receive_smb(cli))
                return False;
 
-       show_msg(cli->inbuf);
-       
        /* sanity check */
        if (CVAL(cli->inbuf,smb_com) != trans) {
                DEBUG(0,("Expected %s response, got command 0x%02x\n",
@@ -242,8 +356,12 @@ static BOOL cli_receive_trans(struct cli_state *cli,int trans,
                         CVAL(cli->inbuf,smb_com)));
                return(False);
        }
-       if (CVAL(cli->inbuf,smb_rcls) != 0)
+
+       /* DOS error "more data" is an acceptable error code */
+       if (cli_error(cli, &eclass, &num) && !(eclass == ERRDOS && num == ERRmoredata))
+       {
                return(False);
+       }
 
        /* parse out the lengths */
        total_data = SVAL(cli->inbuf,smb_tdrcnt);
@@ -281,11 +399,9 @@ static BOOL cli_receive_trans(struct cli_state *cli,int trans,
                if (total_data <= *data_len && total_param <= *param_len)
                        break;
                
-               if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout))
+               if (!cli_receive_smb(cli))
                        return False;
 
-               show_msg(cli->inbuf);
-               
                /* sanity check */
                if (CVAL(cli->inbuf,smb_com) != trans) {
                        DEBUG(0,("Expected %s response, got command 0x%02x\n",
@@ -293,8 +409,11 @@ static BOOL cli_receive_trans(struct cli_state *cli,int trans,
                                 CVAL(cli->inbuf,smb_com)));
                        return(False);
                }
-               if (CVAL(cli->inbuf,smb_rcls) != 0)
+               /* DOS error "more data" is an acceptable error code */
+               if (cli_error(cli, &eclass, &num) && eclass != ERRDOS && num != ERRmoredata)
+               {
                        return(False);
+               }
        }
        
        return(True);
@@ -310,7 +429,7 @@ BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, int pipe_name_len,
                   char **rparam, uint32 *rparam_count,
                   char **rdata, uint32 *rdata_count)
 {
-  if(pipe_name_len == 0)
+  if (pipe_name_len == 0)
     pipe_name_len = strlen(pipe_name);
 
   cli_send_trans(cli, SMBtrans, 
@@ -321,18 +440,18 @@ BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, int pipe_name_len,
                  data, data_count, max_data_count);
 
   return (cli_receive_trans(cli, SMBtrans, 
-                            rparam, rparam_count,
-                            rdata, rdata_count));
+                            rparam, (int *)rparam_count,
+                            rdata, (int *)rdata_count));
 }
 
 /****************************************************************************
 call a remote api
 ****************************************************************************/
-static BOOL cli_api(struct cli_state *cli,
-                    char *param, int prcnt, int mprcnt,
-                    char *data, int drcnt, int mdrcnt,
-                    char **rparam, int *rprcnt,
-                    char **rdata, int *rdrcnt)
+BOOL cli_api(struct cli_state *cli,
+            char *param, int prcnt, int mprcnt,
+            char *data, int drcnt, int mdrcnt,
+            char **rparam, int *rprcnt,
+            char **rdata, int *rdrcnt)
 {
   cli_send_trans(cli,SMBtrans,
                  PIPE_LANMAN,strlen(PIPE_LANMAN), /* Name, length */
@@ -365,46 +484,109 @@ BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation)
        p = param;
        SSVAL(p,0,132); /* api number */
        p += 2;
-       strcpy(p,"OOWb54WrLh");
+       pstrcpy(p,"OOWb54WrLh");
        p = skip_string(p,1);
-       strcpy(p,"WB21BWDWWDDDDDDDzzzD");
+       pstrcpy(p,"WB21BWDWWDDDDDDDzzzD");
        p = skip_string(p,1);
        SSVAL(p,0,1);
        p += 2;
-       strcpy(p,user);
+       pstrcpy(p,user);
        strupper(p);
-       p += 21; p++; p += 15; p++; 
-       strcpy(p, workstation); 
+       p += 21;
+       p++;
+       p += 15;
+       p++; 
+       pstrcpy(p, workstation); 
        strupper(p);
        p += 16;
-       SSVAL(p, 0, BUFFER_SIZE);
+       SSVAL(p, 0, CLI_BUFFER_SIZE);
        p += 2;
-       SSVAL(p, 0, BUFFER_SIZE);
+       SSVAL(p, 0, CLI_BUFFER_SIZE);
        p += 2;
        
-       cli->error = -1;
-       
        if (cli_api(cli, 
                     param, PTR_DIFF(p,param),1024,  /* param, length, max */
-                    NULL, 0, BUFFER_SIZE,           /* data, length, max */
+                    NULL, 0, CLI_BUFFER_SIZE,           /* data, length, max */
                     &rparam, &rprcnt,               /* return params, return size */
                     &rdata, &rdrcnt                 /* return data, return size */
                    )) {
-               cli->error = SVAL(rparam,0);
+               cli->rap_error = SVAL(rparam,0);
                p = rdata;
                
-               if (cli->error == 0) {
+               if (cli->rap_error == 0) {
                        DEBUG(4,("NetWkstaUserLogon success\n"));
                        cli->privilages = SVAL(p, 24);
                        fstrcpy(cli->eff_name,p+2);
                } else {
-                       DEBUG(1,("NetwkstaUserLogon gave error %d\n", cli->error));
+                       DEBUG(1,("NetwkstaUserLogon gave error %d\n", cli->rap_error));
                }
        }
        
-       if (rparam) free(rparam);
-       if (rdata) free(rdata);
-       return cli->error == 0;
+       if (rparam)
+      free(rparam);
+       if (rdata)
+      free(rdata);
+       return (cli->rap_error == 0);
+}
+
+/****************************************************************************
+call a NetShareEnum - try and browse available connections on a host
+****************************************************************************/
+BOOL cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *))
+{
+  char *rparam = NULL;
+  char *rdata = NULL;
+  char *p;
+  int rdrcnt,rprcnt;
+  pstring param;
+  int count = -1;
+
+  /* now send a SMBtrans command with api RNetShareEnum */
+  p = param;
+  SSVAL(p,0,0); /* api number */
+  p += 2;
+  pstrcpy(p,"WrLeh");
+  p = skip_string(p,1);
+  pstrcpy(p,"B13BWz");
+  p = skip_string(p,1);
+  SSVAL(p,0,1);
+  SSVAL(p,2,0xFFFF);
+  p += 4;
+
+  if (cli_api(cli, 
+              param, PTR_DIFF(p,param), 1024,  /* Param, length, maxlen */
+              NULL, 0, 0xFFFF,            /* data, length, maxlen */
+              &rparam, &rprcnt,                /* return params, length */
+              &rdata, &rdrcnt))                /* return data, length */
+    {
+      int res = SVAL(rparam,0);
+      int converter=SVAL(rparam,2);
+      int i;
+      
+      if (res == 0 || res == ERRmoredata) {
+             count=SVAL(rparam,4);
+             p = rdata;
+
+             for (i=0;i<count;i++,p+=20) {
+                     char *sname = p;
+                     int type = SVAL(p,14);
+                     int comment_offset = IVAL(p,16) & 0xFFFF;
+                     char *cmnt = comment_offset?(rdata+comment_offset-converter):"";
+                     fn(sname, type, cmnt);
+             }
+      } else {
+             DEBUG(4,("NetShareEnum res=%d\n", res));
+      }      
+    } else {
+             DEBUG(4,("NetShareEnum failed\n"));
+    }
+  
+  if (rparam)
+    free(rparam);
+  if (rdata)
+    free(rdata);
+
+  return count;
 }
 
 
@@ -416,7 +598,7 @@ The callback function takes 3 arguments: the machine name, the server type and
 the comment.
 ****************************************************************************/
 BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
-                      void (*fn)(char *, uint32, char *))
+                      void (*fn)(const char *, uint32, const char *))
 {
        char *rparam = NULL;
        char *rdata = NULL;
@@ -430,14 +612,14 @@ BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
        p = param;
        SSVAL(p,0,0x68); /* api number */
        p += 2;
-       strcpy(p,"WrLehDz");
+       pstrcpy(p,"WrLehDz");
        p = skip_string(p,1);
   
-       strcpy(p,"B16BBDz");
+       pstrcpy(p,"B16BBDz");
   
        p = skip_string(p,1);
        SSVAL(p,0,uLevel);
-       SSVAL(p,2,BUFFER_SIZE);
+       SSVAL(p,2,CLI_BUFFER_SIZE);
        p += 4;
        SIVAL(p,0,stype);
        p += 4;
@@ -447,7 +629,7 @@ BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
        
        if (cli_api(cli, 
                     param, PTR_DIFF(p,param), 8,        /* params, length, max */
-                    NULL, 0, BUFFER_SIZE,               /* data, length, max */
+                    NULL, 0, CLI_BUFFER_SIZE,               /* data, length, max */
                     &rparam, &rprcnt,                   /* return params, return size */
                     &rdata, &rdrcnt                     /* return data, return size */
                    )) {
@@ -455,7 +637,7 @@ BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
                int converter=SVAL(rparam,2);
                int i;
                        
-               if (res == 0) {
+               if (res == 0 || res == ERRmoredata) {
                        count=SVAL(rparam,4);
                        p = rdata;
                                        
@@ -472,8 +654,10 @@ BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
                }
        }
   
-       if (rparam) free(rparam);
-       if (rdata) free(rdata);
+       if (rparam)
+      free(rparam);
+       if (rdata)
+      free(rdata);
        
        return(count > 0);
 }
@@ -493,14 +677,14 @@ prots[] =
       {PROTOCOL_LANMAN1,"LANMAN1.0"},
       {PROTOCOL_LANMAN2,"LM1.2X002"},
       {PROTOCOL_LANMAN2,"Samba"},
-      {PROTOCOL_NT1,"NT LM 0.12"},
       {PROTOCOL_NT1,"NT LANMAN 1.0"},
+      {PROTOCOL_NT1,"NT LM 0.12"},
       {-1,NULL}
     };
 
 
 /****************************************************************************
-send a session setup
+send a session setup 
 ****************************************************************************/
 BOOL cli_session_setup(struct cli_state *cli, 
                       char *user, 
@@ -509,29 +693,68 @@ BOOL cli_session_setup(struct cli_state *cli,
                       char *workgroup)
 {
        char *p;
-       fstring pword;
+       fstring pword, ntpword;
 
        if (cli->protocol < PROTOCOL_LANMAN1)
+       {
                return True;
+       }
 
-       if (passlen > sizeof(pword)-1) {
+       if (passlen > sizeof(pword)-1 || ntpasslen > sizeof(ntpword)-1)
+       {
                return False;
        }
 
-       if ((cli->sec_mode & 2) && passlen != 24) {
+       if (!IS_BITS_SET_ALL(cli->sec_mode, 1))
+       {
+               /* if in share level security then don't send a password now */
+               fstrcpy(pword, "");
+               passlen=1;
+               fstrcpy(ntpword, "");
+               ntpasslen=1;
+       } 
+       else if ((passlen == 0 || passlen == 1) && (pass[0] == '\0'))
+       {
+               /* Null session connect. */
+               pword  [0] = '\0';
+               ntpword[0] = '\0';
+       }
+       else if (passlen == 24 && ntpasslen == 24)
+       {
+               if (IS_BITS_SET_ALL(cli->sec_mode, 2))
+               {
+                       /* encrypted password, implicit from 24-byte lengths */
+                       memcpy(pword  , pass  , 24);
+                       memcpy(ntpword, ntpass, 24);
+               }
+               else
+               {
+                       DEBUG(0,("cli_session_setup: encrypted passwords not supported by server\n"));
+                       return False;
+               }
+       }
+       else if (ntpasslen == 0 || !IS_BITS_SET_ALL(cli->sec_mode, 2))
+       {
+               /* plain-text password: server doesn't support encrypted. */
+               fstrcpy(pword, pass);
+               fstrcpy(ntpword, "");
+               ntpasslen = 0;
+       }
+       else /* passlen != 0 && ntpasslen != 0 && server supports encryption */
+       {
+               /* plain-text password requesting to be encrypted */
+               uchar *key = (uchar *)cli->cryptkey;
+               SMBencrypt  ((uchar *)pass  , key,(uchar *)pword  );
+               SMBNTencrypt((uchar *)ntpass, key,(uchar *)ntpword);
                passlen = 24;
-               SMBencrypt((uchar *)pass,(uchar *)cli->cryptkey,(uchar *)pword);
-       } else {
-               memcpy(pword, pass, passlen);
+               ntpasslen = 24;
        }
 
-       /* if in share level security then don't send a password now */
-       if (!(cli->sec_mode & 1)) {fstrcpy(pword, "");passlen=1;} 
-
        /* send a session setup command */
        bzero(cli->outbuf,smb_size);
 
-       if (cli->protocol < PROTOCOL_NT1) {
+       if (cli->protocol < PROTOCOL_NT1)
+       {
                set_message(cli->outbuf,10,1 + strlen(user) + passlen,True);
                CVAL(cli->outbuf,smb_com) = SMBsesssetupX;
                cli_setup_packet(cli);
@@ -545,48 +768,68 @@ BOOL cli_session_setup(struct cli_state *cli,
                p = smb_buf(cli->outbuf);
                memcpy(p,pword,passlen);
                p += passlen;
-               strcpy(p,user);
+               pstrcpy(p,user);
                strupper(p);
-       } else {
+       }
+       else
+       {
                set_message(cli->outbuf,13,0,True);
                CVAL(cli->outbuf,smb_com) = SMBsesssetupX;
                cli_setup_packet(cli);
                
                CVAL(cli->outbuf,smb_vwv0) = 0xFF;
-               SSVAL(cli->outbuf,smb_vwv2,BUFFER_SIZE);
+               SSVAL(cli->outbuf,smb_vwv2,CLI_BUFFER_SIZE);
                SSVAL(cli->outbuf,smb_vwv3,2);
                SSVAL(cli->outbuf,smb_vwv4,cli->pid);
                SIVAL(cli->outbuf,smb_vwv5,cli->sesskey);
                SSVAL(cli->outbuf,smb_vwv7,passlen);
                SSVAL(cli->outbuf,smb_vwv8,ntpasslen);
+               SSVAL(cli->outbuf,smb_vwv11,0);
                p = smb_buf(cli->outbuf);
                memcpy(p,pword,passlen); 
                p += SVAL(cli->outbuf,smb_vwv7);
-               memcpy(p,ntpass,ntpasslen); 
+               memcpy(p,ntpword,ntpasslen); 
                p += SVAL(cli->outbuf,smb_vwv8);
-               strcpy(p,user);
+               pstrcpy(p,user);
                strupper(p);
                p = skip_string(p,1);
-               strcpy(p,workgroup);
+               pstrcpy(p,workgroup);
                strupper(p);
                p = skip_string(p,1);
-               strcpy(p,"Unix");p = skip_string(p,1);
-               strcpy(p,"Samba");p = skip_string(p,1);
+               pstrcpy(p,"Unix");p = skip_string(p,1);
+               pstrcpy(p,"Samba");p = skip_string(p,1);
                set_message(cli->outbuf,13,PTR_DIFF(p,smb_buf(cli->outbuf)),False);
        }
 
-      send_smb(cli->fd,cli->outbuf);
-      if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout))
+      cli_send_smb(cli, True);
+      if (!cli_receive_smb(cli))
+       {
+               DEBUG(10,("cli_session_setup: receive smb failed\n"));
              return False;
-
-      show_msg(cli->inbuf);
+       }
 
       if (CVAL(cli->inbuf,smb_rcls) != 0) {
              return False;
       }
 
-      /* use the returned uid from now on */
-      cli->uid = SVAL(cli->inbuf,smb_uid);
+      /* use the returned vuid from now on */
+      cli->vuid = SVAL(cli->inbuf,smb_uid);
+
+      if (cli->protocol >= PROTOCOL_NT1) {
+        /*
+         * Save off some of the connected server
+         * info.
+         */
+        char *server_domain,*server_os,*server_type;
+        server_os = smb_buf(cli->inbuf);
+        server_type = skip_string(server_os,1);
+        server_domain = skip_string(server_type,1);
+        fstrcpy(cli->server_os, server_os);
+        fstrcpy(cli->server_type, server_type);
+        fstrcpy(cli->server_domain, server_domain);
+      }
+
+      fstrcpy(cli->user_name, user);
 
       return True;
 }
@@ -604,8 +847,8 @@ BOOL cli_ulogoff(struct cli_state *cli)
        SSVAL(cli->outbuf,smb_vwv0,0xFF);
        SSVAL(cli->outbuf,smb_vwv2,0);  /* no additional info */
 
-        send_smb(cli->fd,cli->outbuf);
-        if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout))
+        cli_send_smb(cli, True);
+        if (!cli_receive_smb(cli))
                 return False;
 
         return CVAL(cli->inbuf,smb_rcls) == 0;
@@ -622,6 +865,9 @@ BOOL cli_send_tconX(struct cli_state *cli,
        bzero(cli->outbuf,smb_size);
        bzero(cli->inbuf,smb_size);
 
+       fstrcpy(cli->share, share);
+
+       /* in user level security don't send a password now */
        if (cli->sec_mode & 1) {
                passlen = 1;
                pass = "";
@@ -634,7 +880,9 @@ BOOL cli_send_tconX(struct cli_state *cli,
                memcpy(pword, pass, passlen);
        }
 
-       sprintf(fullshare, "\\\\%s\\%s", cli->desthost, share);
+       slprintf(fullshare, sizeof(fullshare)-1,
+                "\\\\%s\\%s", cli->desthost, share);
+       strupper(fullshare);
 
        set_message(cli->outbuf,4,
                    2 + strlen(fullshare) + passlen + strlen(dev),True);
@@ -647,20 +895,37 @@ BOOL cli_send_tconX(struct cli_state *cli,
        p = smb_buf(cli->outbuf);
        memcpy(p,pword,passlen);
        p += passlen;
-       strcpy(p,fullshare);
+       fstrcpy(p,fullshare);
        p = skip_string(p,1);
-       strcpy(p,dev);
+       pstrcpy(p,dev);
 
        SCVAL(cli->inbuf,smb_rcls, 1);
 
-       send_smb(cli->fd,cli->outbuf);
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout))
+       cli_send_smb(cli, True);
+       if (!cli_receive_smb(cli))
                return False;
 
        if (CVAL(cli->inbuf,smb_rcls) != 0) {
                return False;
        }
 
+       fstrcpy(cli->dev, "A:");
+
+       if (cli->protocol >= PROTOCOL_NT1) {
+               fstrcpy(cli->dev, smb_buf(cli->inbuf));
+       }
+
+       if (strcasecmp(share,"IPC$")==0) {
+               fstrcpy(cli->dev, "IPC");
+       }
+
+       /* only grab the device if we have a recent protocol level */
+       if (cli->protocol >= PROTOCOL_NT1 &&
+           smb_buflen(cli->inbuf) == 3) {
+               /* almost certainly win95 - enable bug fixes */
+               cli->win95 = True;
+       }
+
        cli->cnum = SVAL(cli->inbuf,smb_tid);
        return True;
 }
@@ -677,8 +942,8 @@ BOOL cli_tdis(struct cli_state *cli)
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
        
-       send_smb(cli->fd,cli->outbuf);
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout))
+       cli_send_smb(cli, True);
+       if (!cli_receive_smb(cli))
                return False;
        
        return CVAL(cli->inbuf,smb_rcls) == 0;
@@ -687,7 +952,7 @@ BOOL cli_tdis(struct cli_state *cli)
 /****************************************************************************
 rename a file
 ****************************************************************************/
-BOOL cli_mv(struct cli_state *cli, char *fname_src, char *fname_dst)
+BOOL cli_rename(struct cli_state *cli, char *fname_src, char *fname_dst)
 {
         char *p;
 
@@ -704,13 +969,13 @@ BOOL cli_mv(struct cli_state *cli, char *fname_src, char *fname_dst)
 
         p = smb_buf(cli->outbuf);
         *p++ = 4;
-        strcpy(p,fname_src);
+        pstrcpy(p,fname_src);
         p = skip_string(p,1);
         *p++ = 4;
-        strcpy(p,fname_dst);
+        pstrcpy(p,fname_dst);
 
-        send_smb(cli->fd,cli->outbuf);
-        if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout)) {
+        cli_send_smb(cli, True);
+        if (!cli_receive_smb(cli)) {
                 return False;
         }
 
@@ -741,10 +1006,10 @@ BOOL cli_unlink(struct cli_state *cli, char *fname)
   
        p = smb_buf(cli->outbuf);
        *p++ = 4;      
-       strcpy(p,fname);
+       pstrcpy(p,fname);
 
-       send_smb(cli->fd,cli->outbuf);
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout)) {
+       cli_send_smb(cli, True);
+       if (!cli_receive_smb(cli)) {
                return False;
        }
 
@@ -755,7 +1020,6 @@ BOOL cli_unlink(struct cli_state *cli, char *fname)
        return True;
 }
 
-
 /****************************************************************************
 create a directory
 ****************************************************************************/
@@ -774,10 +1038,10 @@ BOOL cli_mkdir(struct cli_state *cli, char *dname)
 
        p = smb_buf(cli->outbuf);
        *p++ = 4;      
-       strcpy(p,dname);
+       pstrcpy(p,dname);
 
-       send_smb(cli->fd,cli->outbuf);
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout)) {
+       cli_send_smb(cli, True);
+       if (!cli_receive_smb(cli)) {
                return False;
        }
 
@@ -806,10 +1070,10 @@ BOOL cli_rmdir(struct cli_state *cli, char *dname)
 
        p = smb_buf(cli->outbuf);
        *p++ = 4;      
-       strcpy(p,dname);
+       pstrcpy(p,dname);
 
-       send_smb(cli->fd,cli->outbuf);
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout)) {
+       cli_send_smb(cli, True);
+       if (!cli_receive_smb(cli)) {
                return False;
        }
 
@@ -822,6 +1086,50 @@ BOOL cli_rmdir(struct cli_state *cli, char *dname)
 
 
 
+/****************************************************************************
+open a file
+****************************************************************************/
+int cli_nt_create(struct cli_state *cli, char *fname)
+{
+       char *p;
+
+       bzero(cli->outbuf,smb_size);
+       bzero(cli->inbuf,smb_size);
+
+       set_message(cli->outbuf,24,1 + strlen(fname),True);
+
+       CVAL(cli->outbuf,smb_com) = SMBntcreateX;
+       SSVAL(cli->outbuf,smb_tid,cli->cnum);
+       cli_setup_packet(cli);
+
+       SSVAL(cli->outbuf,smb_vwv0,0xFF);
+       SIVAL(cli->outbuf,smb_ntcreate_Flags, 0x06);
+       SIVAL(cli->outbuf,smb_ntcreate_RootDirectoryFid, 0x0);
+       SIVAL(cli->outbuf,smb_ntcreate_DesiredAccess, 0x2019f);
+       SIVAL(cli->outbuf,smb_ntcreate_FileAttributes, 0x0);
+       SIVAL(cli->outbuf,smb_ntcreate_ShareAccess, 0x03);
+       SIVAL(cli->outbuf,smb_ntcreate_CreateDisposition, 0x01);
+       SIVAL(cli->outbuf,smb_ntcreate_CreateOptions, 0x0);
+       SIVAL(cli->outbuf,smb_ntcreate_ImpersonationLevel, 0x02);
+       SSVAL(cli->outbuf,smb_ntcreate_NameLength, strlen(fname));
+
+       p = smb_buf(cli->outbuf);
+       pstrcpy(p,fname);
+       p = skip_string(p,1);
+
+       cli_send_smb(cli, True);
+       if (!cli_receive_smb(cli)) {
+               return -1;
+       }
+
+       if (CVAL(cli->inbuf,smb_rcls) != 0) {
+               return -1;
+       }
+
+       return SVAL(cli->inbuf,smb_vwv2 + 1);
+}
+
+
 /****************************************************************************
 open a file
 ****************************************************************************/
@@ -831,6 +1139,12 @@ int cli_open(struct cli_state *cli, char *fname, int flags, int share_mode)
        unsigned openfn=0;
        unsigned accessmode=0;
 
+       /* you must open for RW not just write - otherwise getattrE doesn't
+          work! */
+       if ((flags & O_ACCMODE) == O_WRONLY && strncmp(cli->dev, "LPT", 3)) {
+               flags = (flags & ~O_ACCMODE) | O_RDWR;
+       }
+
        if (flags & O_CREAT)
                openfn |= (1<<4);
        if (!(flags & O_EXCL)) {
@@ -842,9 +1156,9 @@ int cli_open(struct cli_state *cli, char *fname, int flags, int share_mode)
 
        accessmode = (share_mode<<4);
 
-       if ((flags & O_RDWR) == O_RDWR) {
+       if ((flags & O_ACCMODE) == O_RDWR) {
                accessmode |= 2;
-       } else if ((flags & O_WRONLY) == O_WRONLY) {
+       } else if ((flags & O_ACCMODE) == O_WRONLY) {
                accessmode |= 1;
        } 
 
@@ -871,11 +1185,11 @@ int cli_open(struct cli_state *cli, char *fname, int flags, int share_mode)
        SSVAL(cli->outbuf,smb_vwv8,openfn);
   
        p = smb_buf(cli->outbuf);
-       strcpy(p,fname);
+       pstrcpy(p,fname);
        p = skip_string(p,1);
 
-       send_smb(cli->fd,cli->outbuf);
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout)) {
+       cli_send_smb(cli, True);
+       if (!cli_receive_smb(cli)) {
                return -1;
        }
 
@@ -906,8 +1220,8 @@ BOOL cli_close(struct cli_state *cli, int fnum)
        SSVAL(cli->outbuf,smb_vwv0,fnum);
        SIVALS(cli->outbuf,smb_vwv1,-1);
 
-       send_smb(cli->fd,cli->outbuf);
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout)) {
+       cli_send_smb(cli, True);
+       if (!cli_receive_smb(cli)) {
                return False;
        }
 
@@ -925,6 +1239,7 @@ BOOL cli_close(struct cli_state *cli, int fnum)
 BOOL cli_lock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int timeout)
 {
        char *p;
+        int saved_timeout = cli->timeout;
 
        bzero(cli->outbuf,smb_size);
        bzero(cli->inbuf,smb_size);
@@ -946,12 +1261,17 @@ BOOL cli_lock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int ti
        SSVAL(p, 0, cli->pid);
        SIVAL(p, 2, offset);
        SIVAL(p, 6, len);
+       cli_send_smb(cli, True);
 
-       send_smb(cli->fd,cli->outbuf);
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout)) {
+        cli->timeout = (timeout == -1) ? 0x7FFFFFFF : timeout;
+
+       if (!cli_receive_smb(cli)) {
+                cli->timeout = saved_timeout;
                return False;
        }
 
+       cli->timeout = saved_timeout;
+
        if (CVAL(cli->inbuf,smb_rcls) != 0) {
                return False;
        }
@@ -987,8 +1307,8 @@ BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int
        SIVAL(p, 2, offset);
        SIVAL(p, 6, len);
 
-       send_smb(cli->fd,cli->outbuf);
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout)) {
+       cli_send_smb(cli, True);
+       if (!cli_receive_smb(cli)) {
                return False;
        }
 
@@ -1000,18 +1320,18 @@ BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int
 }
 
 
+
 /****************************************************************************
-  read from a file
+issue a single SMBread and don't wait for a reply
 ****************************************************************************/
-int cli_read(struct cli_state *cli, int fnum, char *buf, uint32 offset, uint16 size)
+static void cli_issue_read(struct cli_state *cli, int fnum, off_t offset, 
+                          size_t size, int i)
 {
-       char *p;
-
        bzero(cli->outbuf,smb_size);
        bzero(cli->inbuf,smb_size);
 
        set_message(cli->outbuf,10,0,True);
-
+               
        CVAL(cli->outbuf,smb_com) = SMBreadX;
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
@@ -1021,29 +1341,85 @@ int cli_read(struct cli_state *cli, int fnum, char *buf, uint32 offset, uint16 s
        SIVAL(cli->outbuf,smb_vwv3,offset);
        SSVAL(cli->outbuf,smb_vwv5,size);
        SSVAL(cli->outbuf,smb_vwv6,size);
+       SSVAL(cli->outbuf,smb_mid,cli->mid + i);
 
-       send_smb(cli->fd,cli->outbuf);
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout)) {
-               return -1;
-       }
+       cli_send_smb(cli, True);
+}
 
-       if (CVAL(cli->inbuf,smb_rcls) != 0) {
-               return -1;
-       }
+/****************************************************************************
+  read from a file
+****************************************************************************/
+size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size)
+{
+       char *p;
+       int total = -1;
+       int issued=0;
+       int received=0;
+       int mpx = MAX(cli->max_mux-1, 1);
+       int block = (cli->max_xmit - (smb_size+32)) & ~1023;
+       int mid;
+       int blocks = (size + (block-1)) / block;
+
+       if (size == 0) return 0;
+
+       while (received < blocks) {
+               int size2;
+
+               while (issued - received < mpx && issued < blocks) {
+                       int size1 = MIN(block, size-issued*block);
+                       cli_issue_read(cli, fnum, offset+issued*block, size1, issued);
+                       issued++;
+               }
+
+               if (!cli_receive_smb(cli)) {
+                       return total;
+               }
+
+               received++;
+               mid = SVAL(cli->inbuf, smb_mid) - cli->mid;
+               size2 = SVAL(cli->inbuf, smb_vwv5);
+
+               if (CVAL(cli->inbuf,smb_rcls) != 0) {
+                       blocks = MIN(blocks, mid-1);
+                       continue;
+               }
+
+               if (size2 <= 0) {
+                       blocks = MIN(blocks, mid-1);
+                       /* this distinguishes EOF from an error */
+                       total = MAX(total, 0);
+                       continue;
+               }
+
+               if (size2 > block) {
+                       DEBUG(0,("server returned more than we wanted!\n"));
+                       exit(1);
+               }
+               if (mid >= issued) {
+                       DEBUG(0,("invalid mid from server!\n"));
+                       exit(1);
+               }
+               p = smb_base(cli->inbuf) + SVAL(cli->inbuf,smb_vwv6);
 
-       size = SVAL(cli->inbuf, smb_vwv5);
-       p = smb_base(cli->inbuf) + SVAL(cli->inbuf,smb_vwv6);
+               memcpy(buf+mid*block, p, size2);
 
-       memcpy(buf, p, size);
+               total = MAX(total, mid*block + size2);
+       }
 
-       return size;
+       while (received < issued) {
+               cli_receive_smb(cli);
+               received++;
+       }
+       
+       return total;
 }
 
 
 /****************************************************************************
-  write to a file
+issue a single SMBwrite and don't wait for a reply
 ****************************************************************************/
-int cli_write(struct cli_state *cli, int fnum, char *buf, uint32 offset, uint16 size)
+static void cli_issue_write(struct cli_state *cli, int fnum, off_t offset, uint16 mode, char *buf,
+                           size_t size, int i)
 {
        char *p;
 
@@ -1051,31 +1427,146 @@ int cli_write(struct cli_state *cli, int fnum, char *buf, uint32 offset, uint16
        bzero(cli->inbuf,smb_size);
 
        set_message(cli->outbuf,12,size,True);
-
+       
        CVAL(cli->outbuf,smb_com) = SMBwriteX;
        SSVAL(cli->outbuf,smb_tid,cli->cnum);
        cli_setup_packet(cli);
-
+       
        CVAL(cli->outbuf,smb_vwv0) = 0xFF;
        SSVAL(cli->outbuf,smb_vwv2,fnum);
+
        SIVAL(cli->outbuf,smb_vwv3,offset);
+       SIVAL(cli->outbuf,smb_vwv5,IS_BITS_SET_ALL(mode, 0x0008) ? 0xFFFFFFFF : 0);
+       SSVAL(cli->outbuf,smb_vwv7,mode);
 
+       SSVAL(cli->outbuf,smb_vwv8,IS_BITS_SET_ALL(mode, 0x0008) ? size : 0);
        SSVAL(cli->outbuf,smb_vwv10,size);
-       SSVAL(cli->outbuf,smb_vwv11,smb_buf(cli->outbuf) - smb_base(cli->outbuf));
-
+       SSVAL(cli->outbuf,smb_vwv11,
+             smb_buf(cli->outbuf) - smb_base(cli->outbuf));
+       
        p = smb_base(cli->outbuf) + SVAL(cli->outbuf,smb_vwv11);
        memcpy(p, buf, size);
 
-       send_smb(cli->fd,cli->outbuf);
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout)) {
-               return -1;
+       SSVAL(cli->outbuf,smb_mid,cli->mid + i);
+       
+       cli_send_smb(cli, True);
+}
+
+/****************************************************************************
+  write to a file
+  write_mode: 0x0001 disallow write cacheing
+              0x0002 return bytes remaining
+              0x0004 use raw named pipe protocol
+              0x0008 start of message mode named pipe protocol
+****************************************************************************/
+ssize_t cli_write(struct cli_state *cli,
+                 int fnum, uint16 write_mode,
+                 char *buf, off_t offset, size_t size)
+{
+       int total = -1;
+       int issued=0;
+       int received=0;
+       int mpx = MAX(cli->max_mux-1, 1);
+       int block = (cli->max_xmit - (smb_size+32)) & ~1023;
+       int mid;
+       int blocks = (size + (block-1)) / block;
+
+       if (size == 0) return 0;
+
+       while (received < blocks) {
+               int size2;
+
+               while (issued - received < mpx && issued < blocks) {
+                       int size1 = MIN(block, size-issued*block);
+                       cli_issue_write(cli, fnum, offset+issued*block,
+                                       write_mode,
+                                       buf + issued*block,
+                                       size1, issued);
+                       issued++;
+               }
+
+               if (!cli_receive_smb(cli)) {
+                       return total;
+               }
+
+               received++;
+               mid = SVAL(cli->inbuf, smb_mid) - cli->mid;
+               size2 = SVAL(cli->inbuf, smb_vwv2);
+
+               if (CVAL(cli->inbuf,smb_rcls) != 0) {
+                       blocks = MIN(blocks, mid-1);
+                       continue;
+               }
+
+               if (size2 <= 0) {
+                       blocks = MIN(blocks, mid-1);
+                       /* this distinguishes EOF from an error */
+                       total = MAX(total, 0);
+                       continue;
+               }
+
+               total += size2;
+
+               total = MAX(total, mid*block + size2);
+       }
+
+       while (received < issued) {
+               cli_receive_smb(cli);
+               received++;
        }
+       
+       return total;
+}
+
+
+/****************************************************************************
+do a SMBgetattrE call
+****************************************************************************/
+BOOL cli_getattrE(struct cli_state *cli, int fd, 
+                 uint16 *attr, size_t *size, 
+                 time_t *c_time, time_t *a_time, time_t *m_time)
+{
+       bzero(cli->outbuf,smb_size);
+       bzero(cli->inbuf,smb_size);
+
+       set_message(cli->outbuf,2,0,True);
+
+       CVAL(cli->outbuf,smb_com) = SMBgetattrE;
+       SSVAL(cli->outbuf,smb_tid,cli->cnum);
+       cli_setup_packet(cli);
 
+       SSVAL(cli->outbuf,smb_vwv0,fd);
+
+       cli_send_smb(cli, True);
+       if (!cli_receive_smb(cli)) {
+               return False;
+       }
+       
        if (CVAL(cli->inbuf,smb_rcls) != 0) {
-               return -1;
+               return False;
+       }
+
+       if (size) {
+               *size = IVAL(cli->inbuf, smb_vwv6);
+       }
+
+       if (attr) {
+               *attr = SVAL(cli->inbuf,smb_vwv10);
+       }
+
+       if (c_time) {
+               *c_time = make_unix_date3(cli->inbuf+smb_vwv0);
+       }
+
+       if (a_time) {
+               *a_time = make_unix_date3(cli->inbuf+smb_vwv2);
        }
 
-       return SVAL(cli->inbuf, smb_vwv2);
+       if (m_time) {
+               *m_time = make_unix_date3(cli->inbuf+smb_vwv4);
+       }
+
+       return True;
 }
 
 
@@ -1083,7 +1574,7 @@ int cli_write(struct cli_state *cli, int fnum, char *buf, uint32 offset, uint16
 do a SMBgetatr call
 ****************************************************************************/
 BOOL cli_getatr(struct cli_state *cli, char *fname, 
-               int *attr, uint32 *size, time_t *t)
+               uint16 *attr, size_t *size, time_t *t)
 {
        char *p;
 
@@ -1098,10 +1589,10 @@ BOOL cli_getatr(struct cli_state *cli, char *fname,
 
        p = smb_buf(cli->outbuf);
        *p = 4;
-       strcpy(p+1, fname);
+       pstrcpy(p+1, fname);
 
-       send_smb(cli->fd,cli->outbuf);
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout)) {
+       cli_send_smb(cli, True);
+       if (!cli_receive_smb(cli)) {
                return False;
        }
        
@@ -1129,7 +1620,7 @@ BOOL cli_getatr(struct cli_state *cli, char *fname,
 /****************************************************************************
 do a SMBsetatr call
 ****************************************************************************/
-BOOL cli_setatr(struct cli_state *cli, char *fname, int attr, time_t t)
+BOOL cli_setatr(struct cli_state *cli, char *fname, uint16 attr, time_t t)
 {
        char *p;
 
@@ -1147,12 +1638,12 @@ BOOL cli_setatr(struct cli_state *cli, char *fname, int attr, time_t t)
 
        p = smb_buf(cli->outbuf);
        *p = 4;
-       strcpy(p+1, fname);
+       pstrcpy(p+1, fname);
        p = skip_string(p,1);
        *p = 4;
 
-       send_smb(cli->fd,cli->outbuf);
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout)) {
+       cli_send_smb(cli, True);
+       if (!cli_receive_smb(cli)) {
                return False;
        }
        
@@ -1166,14 +1657,18 @@ BOOL cli_setatr(struct cli_state *cli, char *fname, int attr, time_t t)
 /****************************************************************************
 send a qpathinfo call
 ****************************************************************************/
-BOOL cli_qpathinfo(struct cli_state *cli, char *fname, 
-                  time_t *c_time, time_t *a_time, time_t *m_time, uint32 *size)
+BOOL cli_qpathinfo(struct cli_state *cli, const char *fname, 
+                  time_t *c_time, time_t *a_time, time_t *m_time, 
+                  size_t *size, uint16 *mode)
 {
        int data_len = 0;
        int param_len = 0;
        uint16 setup = TRANSACT2_QPATHINFO;
        pstring param;
        char *rparam=NULL, *rdata=NULL;
+       int count=8;
+       BOOL ret;
+       time_t (*date_fn)(void *);
 
        param_len = strlen(fname) + 7;
 
@@ -1181,38 +1676,53 @@ BOOL cli_qpathinfo(struct cli_state *cli, char *fname,
        SSVAL(param, 0, SMB_INFO_STANDARD);
        pstrcpy(&param[6], fname);
 
-       if (!cli_send_trans(cli, SMBtrans2, 
-                            NULL, 0,                      /* Name, length */
-                            -1, 0,                        /* fid, flags */
-                            &setup, 1, 0,                 /* setup, length, max */
-                            param, param_len, 10,         /* param, length, max */
-                            NULL, data_len, cli->max_xmit /* data, length, max */
-                           )) {
+       do {
+               ret = (cli_send_trans(cli, SMBtrans2, 
+                                     NULL, 0,        /* Name, length */
+                                     -1, 0,          /* fid, flags */
+                                     &setup, 1, 0,   /* setup, length, max */
+                                     param, param_len, 10, /* param, length, max */
+                                     NULL, data_len, cli->max_xmit /* data, length, max */
+                                     ) &&
+                      cli_receive_trans(cli, SMBtrans2, 
+                                        &rparam, &param_len,
+                                        &rdata, &data_len));
+               if (!ret) {
+                       /* we need to work around a Win95 bug - sometimes
+                          it gives ERRSRV/ERRerror temprarily */
+                       uint8 eclass;
+                       uint32 ecode;
+                       cli_error(cli, &eclass, &ecode);
+                       if (eclass != ERRSRV || ecode != ERRerror) break;
+                       msleep(100);
+               }
+       } while (count-- && ret==False);
+
+       if (!ret || !rdata || data_len < 22) {
                return False;
        }
 
-       if (!cli_receive_trans(cli, SMBtrans2, 
-                               &rparam, &param_len,
-                               &rdata, &data_len)) {
-               return False;
-       }
-
-       if (!rdata || data_len < 22) {
-               return False;
+       if (cli->win95) {
+               date_fn = make_unix_date;
+       } else {
+               date_fn = make_unix_date2;
        }
 
        if (c_time) {
-               *c_time = make_unix_date2(rdata+0);
+               *c_time = date_fn(rdata+0);
        }
        if (a_time) {
-               *a_time = make_unix_date2(rdata+4);
+               *a_time = date_fn(rdata+4);
        }
        if (m_time) {
-               *m_time = make_unix_date2(rdata+8);
+               *m_time = date_fn(rdata+8);
        }
        if (size) {
                *size = IVAL(rdata, 12);
        }
+       if (mode) {
+               *mode = SVAL(rdata,l1_attrFile);
+       }
 
        if (rdata) free(rdata);
        if (rparam) free(rparam);
@@ -1222,9 +1732,10 @@ BOOL cli_qpathinfo(struct cli_state *cli, char *fname,
 /****************************************************************************
 send a qpathinfo call with the SMB_QUERY_FILE_ALL_INFO info level
 ****************************************************************************/
-BOOL cli_qpathinfo2(struct cli_state *cli, char *fname, 
+BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname, 
                    time_t *c_time, time_t *a_time, time_t *m_time, 
-                   time_t *w_time, uint32 *size)
+                   time_t *w_time, size_t *size, uint16 *mode,
+                   SMB_INO_T *ino)
 {
        int data_len = 0;
        int param_len = 0;
@@ -1270,9 +1781,15 @@ BOOL cli_qpathinfo2(struct cli_state *cli, char *fname,
        if (w_time) {
                *w_time = interpret_long_date(rdata+24) - cli->serverzone;
        }
+       if (mode) {
+               *mode = SVAL(rdata, 32);
+       }
        if (size) {
                *size = IVAL(rdata, 40);
        }
+       if (ino) {
+               *ino = IVAL(rdata, 64);
+       }
 
        if (rdata) free(rdata);
        if (rparam) free(rparam);
@@ -1284,7 +1801,9 @@ BOOL cli_qpathinfo2(struct cli_state *cli, char *fname,
 send a qfileinfo call
 ****************************************************************************/
 BOOL cli_qfileinfo(struct cli_state *cli, int fnum, 
-                  time_t *c_time, time_t *a_time, time_t *m_time, uint32 *size)
+                  uint16 *mode, size_t *size,
+                  time_t *c_time, time_t *a_time, time_t *m_time, 
+                  time_t *w_time, SMB_INO_T *ino)
 {
        int data_len = 0;
        int param_len = 0;
@@ -1292,11 +1811,15 @@ BOOL cli_qfileinfo(struct cli_state *cli, int fnum,
        pstring param;
        char *rparam=NULL, *rdata=NULL;
 
+       /* if its a win95 server then fail this - win95 totally screws it
+          up */
+       if (cli->win95) return False;
+
        param_len = 4;
 
        memset(param, 0, param_len);
        SSVAL(param, 0, fnum);
-       SSVAL(param, 2, SMB_INFO_STANDARD);
+       SSVAL(param, 2, SMB_QUERY_FILE_ALL_INFO);
 
        if (!cli_send_trans(cli, SMBtrans2, 
                             NULL, 0,                        /* name, length */
@@ -1314,21 +1837,30 @@ BOOL cli_qfileinfo(struct cli_state *cli, int fnum,
                return False;
        }
 
-       if (!rdata || data_len < 22) {
+       if (!rdata || data_len < 68) {
                return False;
        }
 
        if (c_time) {
-               *c_time = make_unix_date2(rdata+0);
+               *c_time = interpret_long_date(rdata+0) - cli->serverzone;
        }
        if (a_time) {
-               *a_time = make_unix_date2(rdata+4);
+               *a_time = interpret_long_date(rdata+8) - cli->serverzone;
        }
        if (m_time) {
-               *m_time = make_unix_date2(rdata+8);
+               *m_time = interpret_long_date(rdata+16) - cli->serverzone;
+       }
+       if (w_time) {
+               *w_time = interpret_long_date(rdata+24) - cli->serverzone;
+       }
+       if (mode) {
+               *mode = SVAL(rdata, 32);
        }
        if (size) {
-               *size = IVAL(rdata, 12);
+               *size = IVAL(rdata, 40);
+       }
+       if (ino) {
+               *ino = IVAL(rdata, 64);
        }
 
        if (rdata) free(rdata);
@@ -1336,12 +1868,284 @@ BOOL cli_qfileinfo(struct cli_state *cli, int fnum,
        return True;
 }
 
+
+/****************************************************************************
+interpret a long filename structure - this is mostly guesses at the moment
+The length of the structure is returned
+The structure of a long filename depends on the info level. 260 is used
+by NT and 2 is used by OS/2
+****************************************************************************/
+static int interpret_long_filename(int level,char *p,file_info *finfo)
+{
+       extern file_info def_finfo;
+
+       if (finfo)
+               memcpy(finfo,&def_finfo,sizeof(*finfo));
+
+       switch (level)
+               {
+               case 1: /* OS/2 understands this */
+                       if (finfo) {
+                               /* these dates are converted to GMT by make_unix_date */
+                               finfo->ctime = make_unix_date2(p+4);
+                               finfo->atime = make_unix_date2(p+8);
+                               finfo->mtime = make_unix_date2(p+12);
+                               finfo->size = IVAL(p,16);
+                               finfo->mode = CVAL(p,24);
+                               pstrcpy(finfo->name,p+27);
+                       }
+                       return(28 + CVAL(p,26));
+
+               case 2: /* this is what OS/2 uses mostly */
+                       if (finfo) {
+                               /* these dates are converted to GMT by make_unix_date */
+                               finfo->ctime = make_unix_date2(p+4);
+                               finfo->atime = make_unix_date2(p+8);
+                               finfo->mtime = make_unix_date2(p+12);
+                               finfo->size = IVAL(p,16);
+                               finfo->mode = CVAL(p,24);
+                               pstrcpy(finfo->name,p+31);
+                       }
+                       return(32 + CVAL(p,30));
+
+                       /* levels 3 and 4 are untested */
+               case 3:
+                       if (finfo) {
+                               /* these dates are probably like the other ones */
+                               finfo->ctime = make_unix_date2(p+8);
+                               finfo->atime = make_unix_date2(p+12);
+                               finfo->mtime = make_unix_date2(p+16);
+                               finfo->size = IVAL(p,20);
+                               finfo->mode = CVAL(p,28);
+                               pstrcpy(finfo->name,p+33);
+                       }
+                       return(SVAL(p,4)+4);
+                       
+               case 4:
+                       if (finfo) {
+                               /* these dates are probably like the other ones */
+                               finfo->ctime = make_unix_date2(p+8);
+                               finfo->atime = make_unix_date2(p+12);
+                               finfo->mtime = make_unix_date2(p+16);
+                               finfo->size = IVAL(p,20);
+                               finfo->mode = CVAL(p,28);
+                               pstrcpy(finfo->name,p+37);
+                       }
+                       return(SVAL(p,4)+4);
+                       
+               case 260: /* NT uses this, but also accepts 2 */
+                       if (finfo) {
+                               int ret = SVAL(p,0);
+                               int namelen;
+                               p += 4; /* next entry offset */
+                               p += 4; /* fileindex */
+                               
+                               /* these dates appear to arrive in a
+                                  weird way. It seems to be localtime
+                                  plus the serverzone given in the
+                                  initial connect. This is GMT when
+                                  DST is not in effect and one hour
+                                  from GMT otherwise. Can this really
+                                  be right??
+
+                                  I suppose this could be called
+                                  kludge-GMT. Is is the GMT you get
+                                  by using the current DST setting on
+                                  a different localtime. It will be
+                                  cheap to calculate, I suppose, as
+                                  no DST tables will be needed */
+
+                               finfo->ctime = interpret_long_date(p); p += 8;
+                               finfo->atime = interpret_long_date(p); p += 8;
+                               finfo->mtime = interpret_long_date(p); p += 8; p += 8;
+                               finfo->size = IVAL(p,0); p += 8;
+                               p += 8; /* alloc size */
+                               finfo->mode = CVAL(p,0); p += 4;
+                               namelen = IVAL(p,0); p += 4;
+                               p += 4; /* EA size */
+                               p += 2; /* short name len? */
+                               p += 24; /* short name? */        
+                               StrnCpy(finfo->name,p,namelen);
+                               return(ret);
+                       }
+                       return(SVAL(p,0));
+               }
+       
+       DEBUG(1,("Unknown long filename format %d\n",level));
+       return(SVAL(p,0));
+}
+
+
+/****************************************************************************
+  do a directory listing, calling fn on each file found
+  ****************************************************************************/
+int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, 
+            void (*fn)(file_info *, const char *))
+{
+       int max_matches = 512;
+       /* NT uses 260, OS/2 uses 2. Both accept 1. */
+       int info_level = cli->protocol<PROTOCOL_NT1?1:260; 
+       char *p, *p2;
+       pstring mask;
+       file_info finfo;
+       int i;
+       char *dirlist = NULL;
+       int dirlist_len = 0;
+       int total_received = -1;
+       BOOL First = True;
+       int ff_resume_key = 0;
+       int ff_searchcount=0;
+       int ff_eos=0;
+       int ff_lastname=0;
+       int ff_dir_handle=0;
+       int loop_count = 0;
+       char *rparam=NULL, *rdata=NULL;
+       int param_len, data_len;
+       
+       uint16 setup;
+       pstring param;
+       
+       pstrcpy(mask,Mask);
+       
+       while (ff_eos == 0) {
+               loop_count++;
+               if (loop_count > 200) {
+                       DEBUG(0,("Error: Looping in FIND_NEXT??\n"));
+                       break;
+               }
+
+               param_len = 12+strlen(mask)+1;
+
+               if (First) {
+                       setup = TRANSACT2_FINDFIRST;
+                       SSVAL(param,0,attribute); /* attribute */
+                       SSVAL(param,2,max_matches); /* max count */
+                       SSVAL(param,4,8+4+2);   /* resume required + close on end + continue */
+                       SSVAL(param,6,info_level); 
+                       SIVAL(param,8,0);
+                       pstrcpy(param+12,mask);
+               } else {
+                       setup = TRANSACT2_FINDNEXT;
+                       SSVAL(param,0,ff_dir_handle);
+                       SSVAL(param,2,max_matches); /* max count */
+                       SSVAL(param,4,info_level); 
+                       SIVAL(param,6,ff_resume_key); /* ff_resume_key */
+                       SSVAL(param,10,8+4+2);  /* resume required + close on end + continue */
+                       pstrcpy(param+12,mask);
+
+                       DEBUG(5,("hand=0x%X resume=%d ff_lastname=%d mask=%s\n",
+                                ff_dir_handle,ff_resume_key,ff_lastname,mask));
+               }
+
+               if (!cli_send_trans(cli, SMBtrans2, 
+                                   NULL, 0,                /* Name, length */
+                                   -1, 0,                  /* fid, flags */
+                                   &setup, 1, 0,           /* setup, length, max */
+                                   param, param_len, 10,   /* param, length, max */
+                                   NULL, 0, 
+                                   cli->max_xmit /* data, length, max */
+                                   )) {
+                       break;
+               }
+
+               if (!cli_receive_trans(cli, SMBtrans2, 
+                                      &rparam, &param_len,
+                                      &rdata, &data_len)) {
+                       /* we need to work around a Win95 bug - sometimes
+                          it gives ERRSRV/ERRerror temprarily */
+                       uint8 eclass;
+                       uint32 ecode;
+                       cli_error(cli, &eclass, &ecode);
+                       if (eclass != ERRSRV || ecode != ERRerror) break;
+                       msleep(100);
+                       continue;
+               }
+
+               if (total_received == -1) total_received = 0;
+
+               /* parse out some important return info */
+               p = rparam;
+               if (First) {
+                       ff_dir_handle = SVAL(p,0);
+                       ff_searchcount = SVAL(p,2);
+                       ff_eos = SVAL(p,4);
+                       ff_lastname = SVAL(p,8);
+               } else {
+                       ff_searchcount = SVAL(p,0);
+                       ff_eos = SVAL(p,2);
+                       ff_lastname = SVAL(p,6);
+               }
+
+               if (ff_searchcount == 0) 
+                       break;
+
+               /* point to the data bytes */
+               p = rdata;
+
+               /* we might need the lastname for continuations */
+               if (ff_lastname > 0) {
+                       switch(info_level)
+                               {
+                               case 260:
+                                       ff_resume_key =0;
+                                       StrnCpy(mask,p+ff_lastname,
+                                               data_len-ff_lastname);
+                                       break;
+                               case 1:
+                                       pstrcpy(mask,p + ff_lastname + 1);
+                                       ff_resume_key = 0;
+                                       break;
+                               }
+               } else {
+                       pstrcpy(mask,"");
+               }
+  
+               /* and add them to the dirlist pool */
+               dirlist = Realloc(dirlist,dirlist_len + data_len);
+
+               if (!dirlist) {
+                       DEBUG(0,("Failed to expand dirlist\n"));
+                       break;
+               }
+
+               /* put in a length for the last entry, to ensure we can chain entries 
+                  into the next packet */
+               for (p2=p,i=0;i<(ff_searchcount-1);i++)
+                       p2 += interpret_long_filename(info_level,p2,NULL);
+               SSVAL(p2,0,data_len - PTR_DIFF(p2,p));
+
+               /* grab the data for later use */
+               memcpy(dirlist+dirlist_len,p,data_len);
+               dirlist_len += data_len;
+
+               total_received += ff_searchcount;
+
+               if (rdata) free(rdata); rdata = NULL;
+               if (rparam) free(rparam); rparam = NULL;
+               
+               DEBUG(3,("received %d entries (eos=%d resume=%d)\n",
+                        ff_searchcount,ff_eos,ff_resume_key));
+
+               First = False;
+       }
+
+       for (p=dirlist,i=0;i<total_received;i++) {
+               p += interpret_long_filename(info_level,p,&finfo);
+               fn(&finfo, Mask);
+       }
+
+       /* free up the dirlist buffer */
+       if (dirlist) free(dirlist);
+       return(total_received);
+}
+
+
 /****************************************************************************
 Send a SamOEMChangePassword command
 ****************************************************************************/
 
-BOOL cli_oem_change_password(struct cli_state *cli, char *user, char *new_password,
-                             char *old_password)
+BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password,
+                             const char *old_password)
 {
   char param[16+sizeof(fstring)];
   char data[532];
@@ -1352,56 +2156,41 @@ BOOL cli_oem_change_password(struct cli_state *cli, char *user, char *new_passwo
   unsigned char new_pw_hash[16];
   int data_len;
   int param_len = 0;
-  int new_pw_len = strlen(new_password);
   char *rparam = NULL;
   char *rdata = NULL;
   int rprcnt, rdrcnt;
 
-  cli->error = -1;
-
-  if(strlen(user) >= sizeof(fstring)-1) {
+  if (strlen(user) >= sizeof(fstring)-1) {
     DEBUG(0,("cli_oem_change_password: user name %s is too long.\n", user));
     return False;
   }
 
-  if(new_pw_len > 512) {
-    DEBUG(0,("cli_oem_change_password: new password for user %s is too long.\n", user));
-    return False;
-  }
-
   SSVAL(p,0,214); /* SamOEMChangePassword command. */
   p += 2;
-  strcpy(p, "zsT");
+  pstrcpy(p, "zsT");
   p = skip_string(p,1);
-  strcpy(p, "B516B16");
+  pstrcpy(p, "B516B16");
   p = skip_string(p,1);
-  fstrcpy(p,user);
+  pstrcpy(p,user);
   p = skip_string(p,1);
   SSVAL(p,0,532);
   p += 2;
 
   param_len = PTR_DIFF(p,param);
 
-  /*
-   * Now setup the data area.
-   * We need to generate a random fill
-   * for this area to make it harder to
-   * decrypt. JRA.
-   */
-  generate_random_buffer(data, sizeof(data), False);
-  fstrcpy( &data[512 - new_pw_len], new_password);
-  SIVAL(data, 512, new_pw_len);
-
   /*
    * Get the Lanman hash of the old password, we
-   * use this as the key to SamOEMHash().
+   * use this as the key to make_oem_passwd_hash().
    */
   memset(upper_case_old_pw, '\0', sizeof(upper_case_old_pw));
   fstrcpy(upper_case_old_pw, old_password);
   strupper(upper_case_old_pw);
   E_P16((uchar *)upper_case_old_pw, old_pw_hash);
 
-  SamOEMhash( (unsigned char *)data, (unsigned char *)old_pw_hash, True);
+       if (!make_oem_passwd_hash( data, new_password, old_pw_hash, False))
+       {
+               return False;
+       }
 
   /* 
    * Now place the old password hash in the data.
@@ -1416,23 +2205,24 @@ BOOL cli_oem_change_password(struct cli_state *cli, char *user, char *new_passwo
 
   data_len = 532;
     
-  if(cli_send_trans(cli,SMBtrans,
+  if (!cli_send_trans(cli,SMBtrans,
                     PIPE_LANMAN,strlen(PIPE_LANMAN),      /* name, length */
                     0,0,                                  /* fid, flags */
                     NULL,0,0,                             /* setup, length, max */
                     param,param_len,2,                    /* param, length, max */
                     data,data_len,0                       /* data, length, max */
-                   ) == False) {
+                   ))
+  {
     DEBUG(0,("cli_oem_change_password: Failed to send password change for user %s\n",
               user ));
     return False;
   }
 
-  if(cli_receive_trans(cli,SMBtrans,
+  if (cli_receive_trans(cli,SMBtrans,
                        &rparam, &rprcnt,
                        &rdata, &rdrcnt)) {
-    if(rparam)
-      cli->error = SVAL(rparam,0);
+    if (rparam)
+      cli->rap_error = SVAL(rparam,0);
   }
 
   if (rparam)
@@ -1440,7 +2230,7 @@ BOOL cli_oem_change_password(struct cli_state *cli, char *user, char *new_passwo
   if (rdata)
     free(rdata);
 
-  return (cli->error == 0);
+  return (cli->rap_error == 0);
 }
 
 /****************************************************************************
@@ -1467,7 +2257,7 @@ BOOL cli_negprot(struct cli_state *cli)
             prots[numprots].name && prots[numprots].prot<=cli->protocol;
             numprots++) {
                *p++ = 2;
-               strcpy(p,prots[numprots].name);
+               pstrcpy(p,prots[numprots].name);
                p += strlen(p) + 1;
        }
 
@@ -1476,11 +2266,11 @@ BOOL cli_negprot(struct cli_state *cli)
 
        CVAL(smb_buf(cli->outbuf),0) = 2;
 
-       send_smb(cli->fd,cli->outbuf);
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout))
+       cli_send_smb(cli, True);
+       if (!cli_receive_smb(cli))
+       {
                return False;
-
-       show_msg(cli->inbuf);
+       }
 
        if (CVAL(cli->inbuf,smb_rcls) != 0 || 
            ((int)SVAL(cli->inbuf,smb_vwv0) >= numprots)) {
@@ -1493,15 +2283,18 @@ BOOL cli_negprot(struct cli_state *cli)
        if (cli->protocol >= PROTOCOL_NT1) {    
                /* NT protocol */
                cli->sec_mode = CVAL(cli->inbuf,smb_vwv1);
+               cli->max_mux = SVAL(cli->inbuf, smb_vwv1+1);
                cli->max_xmit = IVAL(cli->inbuf,smb_vwv3+1);
                cli->sesskey = IVAL(cli->inbuf,smb_vwv7+1);
                cli->serverzone = SVALS(cli->inbuf,smb_vwv15+1)*60;
                /* this time arrives in real GMT */
                cli->servertime = interpret_long_date(cli->inbuf+smb_vwv11+1);
                memcpy(cli->cryptkey,smb_buf(cli->inbuf),8);
-               if (IVAL(cli->inbuf,smb_vwv9+1) & 1)
-                       cli->readbraw_supported = 
-                               cli->writebraw_supported = True;      
+               cli->capabilities = IVAL(cli->inbuf,smb_vwv9+1);
+               if (cli->capabilities & 1) {
+                       cli->readbraw_supported = True;
+                       cli->writebraw_supported = True;      
+               }
        } else if (cli->protocol >= PROTOCOL_LANMAN1) {
                cli->sec_mode = SVAL(cli->inbuf,smb_vwv1);
                cli->max_xmit = SVAL(cli->inbuf,smb_vwv2);
@@ -1518,50 +2311,61 @@ BOOL cli_negprot(struct cli_state *cli)
                cli->serverzone = TimeDiff(time(NULL));
        }
 
+       cli->max_xmit = MIN(cli->max_xmit, CLI_BUFFER_SIZE);
+
        return True;
 }
 
 
 /****************************************************************************
-  send a session request
+  send a session request.  see rfc1002.txt 4.3 and 4.3.2
 ****************************************************************************/
-BOOL cli_session_request(struct cli_state *cli, char *host, int name_type,
-                        char *myname)
+BOOL cli_session_request(struct cli_state *cli,
+                        struct nmb_name *calling, struct nmb_name *called)
 {
-       fstring dest;
        char *p;
        int len = 4;
        /* send a session request (RFC 1002) */
 
-       fstrcpy(dest,host);
+       memcpy(&(cli->calling), calling, sizeof(*calling));
+       memcpy(&(cli->called ), called , sizeof(*called ));
   
-       p = strchr(dest,'.');
-       if (p) *p = 0;
-
-       fstrcpy(cli->desthost, dest);
-
        /* put in the destination name */
        p = cli->outbuf+len;
-       name_mangle(dest,p,name_type);
+       name_mangle(cli->called .name, p, cli->called .name_type);
        len += name_len(p);
 
        /* and my name */
        p = cli->outbuf+len;
-       name_mangle(myname,p,0);
+       name_mangle(cli->calling.name, p, cli->calling.name_type);
        len += name_len(p);
 
        /* setup the packet length */
        _smb_setlen(cli->outbuf,len);
        CVAL(cli->outbuf,0) = 0x81;
 
-       send_smb(cli->fd,cli->outbuf);
+#ifdef WITH_SSL
+retry:
+#endif /* WITH_SSL */
+
+       cli_send_smb(cli, False);
        DEBUG(5,("Sent session request\n"));
 
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout))
+       if (!cli_receive_smb(cli))
                return False;
 
+#ifdef WITH_SSL
+    if (CVAL(cli->inbuf,0) == 0x83 && CVAL(cli->inbuf,4) == 0x8e){ /* use ssl */
+        if (!sslutil_fd_is_ssl(cli->fd)){
+            if (sslutil_connect(cli->fd) == 0)
+                goto retry;
+        }
+    }
+#endif /* WITH_SSL */
+
        if (CVAL(cli->inbuf,0) != 0x82) {
-               cli->error = CVAL(cli->inbuf,0);
+                /* This is the wrong place to put the error... JRA. */
+               cli->rap_error = CVAL(cli->inbuf,0);
                return False;
        }
        return(True);
@@ -1571,22 +2375,26 @@ BOOL cli_session_request(struct cli_state *cli, char *host, int name_type,
 /****************************************************************************
 open the client sockets
 ****************************************************************************/
-BOOL cli_connect(struct cli_state *cli, char *host, struct in_addr *ip)
+BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip)
 {
-       struct in_addr dest_ip;
+       extern struct in_addr ipzero;
 
        fstrcpy(cli->desthost, host);
        
-       if (!ip) {
-                if(!resolve_name( cli->desthost, &dest_ip)) {
+       if (!ip || ip_equal(*ip, ipzero)) {
+                if (!resolve_name( cli->desthost, &cli->dest_ip, 0x20)) {
                         return False;
                 }
+               if (ip) *ip = cli->dest_ip;
        } else {
-               dest_ip = *ip;
+               cli->dest_ip = *ip;
        }
 
 
-       cli->fd = open_socket_out(SOCK_STREAM, &dest_ip, 139, cli->timeout);
+       if (cli -> port == 0) cli -> port = 139;
+
+       cli->fd = open_socket_out(SOCK_STREAM, &cli->dest_ip, 
+                                 cli -> port, cli->timeout);
        if (cli->fd == -1)
                return False;
 
@@ -1597,25 +2405,41 @@ BOOL cli_connect(struct cli_state *cli, char *host, struct in_addr *ip)
 /****************************************************************************
 initialise a client structure
 ****************************************************************************/
-BOOL cli_initialise(struct cli_state *cli)
+struct cli_state *cli_initialise(struct cli_state *cli)
 {
-       if (cli->initialised) cli_shutdown(cli);
+       if (!cli) {
+               cli = (struct cli_state *)malloc(sizeof(*cli));
+               if (!cli)
+                       return NULL;
+               ZERO_STRUCTP(cli);
+       }
 
-       memset(cli, 0, sizeof(*cli));
+       if (cli->initialised) {
+               cli_shutdown(cli);
+       }
+
+       ZERO_STRUCTP(cli);
+
+       cli -> port = 0;
        cli->fd = -1;
        cli->cnum = -1;
-       cli->pid = getpid();
+       cli->pid = (uint16)getpid();
        cli->mid = 1;
-       cli->uid = getuid();
+       cli->vuid = UID_FIELD_INVALID;
        cli->protocol = PROTOCOL_NT1;
        cli->timeout = 20000;
-       cli->bufsize = 0x10000;
-       cli->max_xmit = cli->bufsize - 4;
+       cli->bufsize = CLI_BUFFER_SIZE+4;
+       cli->max_xmit = cli->bufsize;
        cli->outbuf = (char *)malloc(cli->bufsize);
        cli->inbuf = (char *)malloc(cli->bufsize);
-       if (!cli->outbuf || !cli->inbuf) return False;
+       if (!cli->outbuf || !cli->inbuf)
+       {
+               return False;
+       }
+
        cli->initialised = 1;
-       return True;
+
+       return cli;
 }
 
 /****************************************************************************
@@ -1623,19 +2447,105 @@ shutdown a client structure
 ****************************************************************************/
 void cli_shutdown(struct cli_state *cli)
 {
-       if (cli->outbuf) free(cli->outbuf);
-       if (cli->inbuf) free(cli->inbuf);
-       if (cli->fd != -1) close(cli->fd);
+       DEBUG(10,("cli_shutdown\n"));
+       if (cli->outbuf)
+       {
+               free(cli->outbuf);
+       }
+       if (cli->inbuf)
+       {
+               free(cli->inbuf);
+       }
+#ifdef WITH_SSL
+    if (cli->fd != -1)
+      sslutil_disconnect(cli->fd);
+#endif /* WITH_SSL */
+       if (cli->fd != -1) 
+       {
+               close(cli->fd);
+       }
        memset(cli, 0, sizeof(*cli));
 }
 
+
 /****************************************************************************
   return error codes for the last packet
+  returns 0 if there was no error and the best approx of a unix errno
+  otherwise
+
+  for 32 bit "warnings", a return code of 0 is expected.
+
 ****************************************************************************/
-void cli_error(struct cli_state *cli, int *eclass, int *num)
+int cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num)
 {
-       *eclass = CVAL(cli->inbuf,smb_rcls);
-       *num = SVAL(cli->inbuf,smb_err);
+       int  flgs2;
+       char rcls;
+       int code;
+
+       if (!cli->initialised)
+       {
+               DEBUG(0,("cli_error: client state uninitialised!\n"));
+               return EINVAL;
+       }
+
+       flgs2 = SVAL(cli->inbuf,smb_flg2);
+
+       if (eclass) *eclass = 0;
+       if (num   ) *num = 0;
+
+       if (flgs2 & FLAGS2_32_BIT_ERROR_CODES) {
+               /* 32 bit error codes detected */
+               uint32 nt_err = IVAL(cli->inbuf,smb_rcls);
+               if (num) *num = nt_err;
+               DEBUG(10,("cli_error: 32 bit codes: code=%08x\n", nt_err));
+               if (!IS_BITS_SET_ALL(nt_err, 0xc0000000)) return 0;
+
+               switch (nt_err & 0xFFFFFF) {
+               case NT_STATUS_ACCESS_VIOLATION: return EACCES;
+               case NT_STATUS_NO_SUCH_FILE: return ENOENT;
+               case NT_STATUS_NO_SUCH_DEVICE: return ENODEV;
+               case NT_STATUS_INVALID_HANDLE: return EBADF;
+               case NT_STATUS_NO_MEMORY: return ENOMEM;
+               case NT_STATUS_ACCESS_DENIED: return EACCES;
+               case NT_STATUS_OBJECT_NAME_NOT_FOUND: return ENOENT;
+               case NT_STATUS_SHARING_VIOLATION: return EBUSY;
+               case NT_STATUS_OBJECT_PATH_INVALID: return ENOTDIR;
+               case NT_STATUS_OBJECT_NAME_COLLISION: return EEXIST;
+               }
+
+               /* for all other cases - a default code */
+               return EINVAL;
+       }
+
+       rcls  = CVAL(cli->inbuf,smb_rcls);
+       code  = SVAL(cli->inbuf,smb_err);
+       if (rcls == 0) return 0;
+
+       if (eclass) *eclass = rcls;
+       if (num   ) *num    = code;
+
+       if (rcls == ERRDOS) {
+               switch (code) {
+               case ERRbadfile: return ENOENT;
+               case ERRbadpath: return ENOTDIR;
+               case ERRnoaccess: return EACCES;
+               case ERRfilexists: return EEXIST;
+               case ERRrename: return EEXIST;
+               case ERRbadshare: return EBUSY;
+               case ERRlock: return EBUSY;
+               }
+       }
+       if (rcls == ERRSRV) {
+               switch (code) {
+               case ERRbadpw: return EPERM;
+               case ERRaccess: return EACCES;
+               case ERRnoresource: return ENOMEM;
+               case ERRinvdevice: return ENODEV;
+               case ERRinvnetname: return ENODEV;
+               }
+       }
+       /* for other cases */
+       return EINVAL;
 }
 
 /****************************************************************************
@@ -1649,9 +2559,551 @@ void cli_sockopt(struct cli_state *cli, char *options)
 /****************************************************************************
 set the PID to use for smb messages. Return the old pid.
 ****************************************************************************/
-int cli_setpid(struct cli_state *cli, int pid)
+uint16 cli_setpid(struct cli_state *cli, uint16 pid)
 {
-       int ret = cli->pid;
+       uint16 ret = cli->pid;
        cli->pid = pid;
        return ret;
 }
+
+/****************************************************************************
+re-establishes a connection
+****************************************************************************/
+BOOL cli_reestablish_connection(struct cli_state *cli)
+{
+       struct nmb_name calling;
+       struct nmb_name called;
+       fstring dest_host;
+       fstring share;
+       fstring dev;
+       BOOL do_tcon = False;
+       int oldfd = cli->fd;
+
+       if (!cli->initialised || cli->fd == -1)
+       {
+               DEBUG(3,("cli_reestablish_connection: not connected\n"));
+               return False;
+       }
+
+       /* copy the parameters necessary to re-establish the connection */
+
+       if (cli->cnum != 0)
+       {
+               fstrcpy(share, cli->share);
+               fstrcpy(dev  , cli->dev);
+               do_tcon = True;
+       }
+
+       memcpy(&called , &(cli->called ), sizeof(called ));
+       memcpy(&calling, &(cli->calling), sizeof(calling));
+       fstrcpy(dest_host, cli->full_dest_host_name);
+
+       DEBUG(5,("cli_reestablish_connection: %s connecting to %s (ip %s) - %s [%s]\n",
+                nmb_namestr(&calling), nmb_namestr(&called), 
+                inet_ntoa(cli->dest_ip),
+                cli->user_name, cli->domain));
+
+       cli->fd = -1;
+
+       if (cli_establish_connection(cli,
+                                    dest_host, &cli->dest_ip,
+                                    &calling, &called,
+                                    share, dev, False, do_tcon)) {
+               if (cli->fd != oldfd) {
+                       if (dup2(cli->fd, oldfd) == oldfd) {
+                               close(cli->fd);
+                       }
+               }
+               return True;
+       }
+       return False;
+}
+
+/****************************************************************************
+establishes a connection right up to doing tconX, reading in a password.
+****************************************************************************/
+BOOL cli_establish_connection(struct cli_state *cli, 
+                               char *dest_host, struct in_addr *dest_ip,
+                               struct nmb_name *calling, struct nmb_name *called,
+                               char *service, char *service_type,
+                               BOOL do_shutdown, BOOL do_tcon)
+{
+       DEBUG(5,("cli_establish_connection: %s connecting to %s (%s) - %s [%s]\n",
+                         nmb_namestr(calling), nmb_namestr(called), inet_ntoa(*dest_ip),
+                     cli->user_name, cli->domain));
+
+       /* establish connection */
+
+       if ((!cli->initialised))
+       {
+               return False;
+       }
+
+       if (cli->fd == -1)
+       {
+               if (!cli_connect(cli, dest_host, dest_ip))
+               {
+                       DEBUG(1,("cli_establish_connection: failed to connect to %s (%s)\n",
+                                         nmb_namestr(calling), inet_ntoa(*dest_ip)));
+                       return False;
+               }
+       }
+
+       if (!cli_session_request(cli, calling, called))
+       {
+               DEBUG(1,("failed session request\n"));
+               if (do_shutdown)
+          cli_shutdown(cli);
+               return False;
+       }
+
+       if (!cli_negprot(cli))
+       {
+               DEBUG(1,("failed negprot\n"));
+               if (do_shutdown)
+          cli_shutdown(cli);
+               return False;
+       }
+
+       if (cli->pwd.cleartext || cli->pwd.null_pwd)
+       {
+               fstring passwd;
+               int pass_len;
+
+               if (cli->pwd.null_pwd)
+               {
+                       /* attempt null session */
+                       passwd[0] = 0;
+                       pass_len = 1;
+               }
+               else
+               {
+                       /* attempt clear-text session */
+                       pwd_get_cleartext(&(cli->pwd), passwd);
+                       pass_len = strlen(passwd);
+               }
+
+               /* attempt clear-text session */
+               if (!cli_session_setup(cli, cli->user_name,
+                              passwd, pass_len,
+                              NULL, 0,
+                              cli->domain))
+               {
+                       DEBUG(1,("failed session setup\n"));
+                       if (do_shutdown)
+                       {
+                               cli_shutdown(cli);
+                       }
+                       return False;
+               }
+               if (do_tcon)
+               {
+                       if (!cli_send_tconX(cli, service, service_type,
+                                           (char*)passwd, strlen(passwd)))
+                       {
+                               DEBUG(1,("failed tcon_X\n"));
+                               if (do_shutdown)
+                               {
+                                       cli_shutdown(cli);
+                               }
+                               return False;
+                       }
+               }
+       }
+       else
+       {
+               /* attempt encrypted session */
+               unsigned char nt_sess_pwd[24];
+               unsigned char lm_sess_pwd[24];
+
+               /* creates (storing a copy of) and then obtains a 24 byte password OWF */
+               pwd_make_lm_nt_owf(&(cli->pwd), cli->cryptkey);
+               pwd_get_lm_nt_owf(&(cli->pwd), lm_sess_pwd, nt_sess_pwd);
+
+               /* attempt encrypted session */
+               if (!cli_session_setup(cli, cli->user_name,
+                              (char*)lm_sess_pwd, sizeof(lm_sess_pwd),
+                              (char*)nt_sess_pwd, sizeof(nt_sess_pwd),
+                              cli->domain))
+               {
+                       DEBUG(1,("failed session setup\n"));
+                       if (do_shutdown)
+                       {
+                               cli_shutdown(cli);
+                       }
+                       return False;
+               }
+
+               if (do_tcon)
+               {
+                       if (!cli_send_tconX(cli, service, service_type,
+                                           (char*)nt_sess_pwd, sizeof(nt_sess_pwd)))
+                       {
+                               DEBUG(1,("failed tcon_X\n"));
+                               if (do_shutdown)
+                               {
+                                       cli_shutdown(cli);
+                               }
+                               return False;
+                       }
+               }
+       }
+
+       if (do_shutdown)
+       {
+               cli_shutdown(cli);
+       }
+
+       return True;
+}
+
+
+/****************************************************************************
+ connect to one of multiple servers: don't care which
+****************************************************************************/
+BOOL cli_connect_serverlist(struct cli_state *cli, char *p)
+{
+       extern pstring global_myname;
+       extern pstring scope;
+       fstring remote_machine;
+       struct in_addr dest_ip;
+       struct nmb_name calling, called, stupid_smbserver_called;
+       BOOL connected_ok = False;
+
+       /*
+       * Treat each name in the 'password server =' line as a potential
+       * PDC/BDC. Contact each in turn and try and authenticate.
+       */
+
+       while(p && next_token(&p,remote_machine,LIST_SEP,sizeof(remote_machine)))
+       {
+               ZERO_STRUCTP(cli);
+
+               if (!cli_initialise(cli))
+               {
+                       DEBUG(0,("cli_connect_serverlist: unable to initialize client connection.\n"));
+                       return False;
+               }
+
+               standard_sub_basic(remote_machine);
+               strupper(remote_machine);
+
+               if (!resolve_name( remote_machine, &dest_ip, 0x20))
+               {
+                       DEBUG(1,("cli_connect_serverlist: Can't resolve address for %s\n", remote_machine));
+                       continue;
+               }   
+
+               if ((lp_security() != SEC_USER) && (ismyip(dest_ip)))
+               {
+                       DEBUG(1,("cli_connect_serverlist: Password server loop - not using password server %s\n", remote_machine));
+                       continue;
+               }
+
+               make_nmb_name(&calling, global_myname , 0x0 , scope);
+               make_nmb_name(&called , remote_machine, 0x20, scope);
+               /* stupid microsoft destruction of the ability of netbios
+                * to provide multiple netbios servers on one host.
+                */
+               make_nmb_name(&stupid_smbserver_called , "*SMBSERVER", 0x20, scope);
+
+               pwd_set_nullpwd(&cli->pwd);
+
+               if (!cli_establish_connection(cli, remote_machine, &dest_ip,
+                                             &calling, &called,
+                                             "IPC$", "IPC", 
+                                             False, True) &&
+                   !cli_establish_connection(cli, remote_machine, &dest_ip,
+                                             &calling, &stupid_smbserver_called,
+                                             "IPC$", "IPC", 
+                                             False, True))
+               {
+                       cli_shutdown(cli);
+                       continue;
+               }      
+
+               if (cli->protocol < PROTOCOL_LANMAN2 ||
+                   !IS_BITS_SET_ALL(cli->sec_mode, 1))
+               {
+                       DEBUG(1,("cli_connect_serverlist: machine %s isn't in user level security mode\n",
+                                 remote_machine));
+                       cli_shutdown(cli);
+                       continue;
+               }
+
+               /*
+                * We have an anonymous connection to IPC$.
+                */
+
+               connected_ok = True;
+               break;
+       }
+
+       if (!connected_ok)
+       {
+               DEBUG(0,("cli_connect_serverlist: Domain password server not available.\n"));
+               cli_shutdown(cli);
+       }
+
+       return connected_ok;
+}
+
+/****************************************************************************
+  cancel a print job
+  ****************************************************************************/
+int cli_printjob_del(struct cli_state *cli, int job)
+{
+       char *rparam = NULL;
+       char *rdata = NULL;
+       char *p;
+       int rdrcnt,rprcnt, ret = -1;
+       pstring param;
+
+       bzero(param,sizeof(param));
+
+       p = param;
+       SSVAL(p,0,81);          /* DosPrintJobDel() */
+       p += 2;
+       pstrcpy(p,"W");
+       p = skip_string(p,1);
+       pstrcpy(p,"");
+       p = skip_string(p,1);
+       SSVAL(p,0,job);     
+       p += 2;
+       
+       if (cli_api(cli, 
+                   param, PTR_DIFF(p,param), 1024,  /* Param, length, maxlen */
+                   NULL, 0, CLI_BUFFER_SIZE,            /* data, length, maxlen */
+                   &rparam, &rprcnt,                /* return params, length */
+                   &rdata, &rdrcnt)) {               /* return data, length */
+               ret = SVAL(rparam,0);
+       }
+
+       if (rparam) free(rparam);
+       if (rdata) free(rdata);
+
+       return ret;
+}
+
+
+/****************************************************************************
+call fn() on each entry in a print queue
+****************************************************************************/
+int cli_print_queue(struct cli_state *cli, 
+                   void (*fn)(struct print_job_info *))
+{
+       char *rparam = NULL;
+       char *rdata = NULL;
+       char *p;
+       int rdrcnt, rprcnt;
+       pstring param;
+       int result_code=0;
+       int i = -1;
+       
+       bzero(param,sizeof(param));
+
+       p = param;
+       SSVAL(p,0,76);         /* API function number 76 (DosPrintJobEnum) */
+       p += 2;
+       pstrcpy(p,"zWrLeh");   /* parameter description? */
+       p = skip_string(p,1);
+       pstrcpy(p,"WWzWWDDzz");  /* returned data format */
+       p = skip_string(p,1);
+       pstrcpy(p,cli->share);    /* name of queue */
+       p = skip_string(p,1);
+       SSVAL(p,0,2);   /* API function level 2, PRJINFO_2 data structure */
+       SSVAL(p,2,1000); /* size of bytes of returned data buffer */
+       p += 4;
+       pstrcpy(p,"");   /* subformat */
+       p = skip_string(p,1);
+
+       DEBUG(4,("doing cli_print_queue for %s\n", cli->share));
+
+       if (cli_api(cli, 
+                   param, PTR_DIFF(p,param), 1024,  /* Param, length, maxlen */
+                   NULL, 0, CLI_BUFFER_SIZE,            /* data, length, maxlen */
+                   &rparam, &rprcnt,                /* return params, length */
+                   &rdata, &rdrcnt)) {               /* return data, length */
+               int converter;
+               result_code = SVAL(rparam,0);
+               converter = SVAL(rparam,2);       /* conversion factor */
+
+               if (result_code == 0) {
+                       struct print_job_info job;
+                       
+                       p = rdata; 
+
+                       for (i = 0; i < SVAL(rparam,4); ++i) {
+                               job.id = SVAL(p,0);
+                               job.priority = SVAL(p,2);
+                               fstrcpy(job.user,
+                                       fix_char_ptr(SVAL(p,4), converter, 
+                                                    rdata, rdrcnt));
+                               job.t = make_unix_date3(p + 12);
+                               job.size = IVAL(p,16);
+                               fstrcpy(job.name,fix_char_ptr(SVAL(p,24), 
+                                                             converter, 
+                                                             rdata, rdrcnt));
+                               fn(&job);                               
+                               p += 28;
+                       }
+               }
+       }
+
+       /* If any parameters or data were returned, free the storage. */
+       if(rparam) free(rparam);
+       if(rdata) free(rdata);
+
+       return i;
+}
+
+/****************************************************************************
+check for existance of a dir
+****************************************************************************/
+BOOL cli_chkpath(struct cli_state *cli, char *path)
+{
+       fstring path2;
+       char *p;
+       
+       fstrcpy(path2,path);
+       trim_string(path2,NULL,"\\");
+       if (!*path2) *path2 = '\\';
+       
+       bzero(cli->outbuf,smb_size);
+       set_message(cli->outbuf,0,4 + strlen(path2),True);
+       SCVAL(cli->outbuf,smb_com,SMBchkpth);
+       SSVAL(cli->outbuf,smb_tid,cli->cnum);
+       cli_setup_packet(cli);
+       
+       p = smb_buf(cli->outbuf);
+       *p++ = 4;
+       fstrcpy(p,path2);
+
+       cli_send_smb(cli, True);
+       if (!cli_receive_smb(cli)) {
+               return False;
+       }
+
+       if (cli_error(cli, NULL, NULL)) return False;
+
+       return True;
+}
+
+
+/****************************************************************************
+start a message sequence
+****************************************************************************/
+BOOL cli_message_start(struct cli_state *cli, char *host, char *username, 
+                             int *grp)
+{
+       char *p;
+
+       /* send a SMBsendstrt command */
+       bzero(cli->outbuf,smb_size);
+       set_message(cli->outbuf,0,0,True);
+       CVAL(cli->outbuf,smb_com) = SMBsendstrt;
+       SSVAL(cli->outbuf,smb_tid,cli->cnum);
+       cli_setup_packet(cli);
+       
+       p = smb_buf(cli->outbuf);
+       *p++ = 4;
+       pstrcpy(p,username);
+       p = skip_string(p,1);
+       *p++ = 4;
+       pstrcpy(p,host);
+       p = skip_string(p,1);
+       
+       set_message(cli->outbuf,0,PTR_DIFF(p,smb_buf(cli->outbuf)),False);
+       
+       cli_send_smb(cli, True);        
+       
+       if (!cli_receive_smb(cli)) {
+               return False;
+       }
+
+       if (cli_error(cli, NULL, NULL)) return False;
+
+       *grp = SVAL(cli->inbuf,smb_vwv0);
+
+       return True;
+}
+
+
+/****************************************************************************
+send a message 
+****************************************************************************/
+BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp)
+{
+       char *p;
+
+       bzero(cli->outbuf,smb_size);
+       set_message(cli->outbuf,1,len+3,True);
+       CVAL(cli->outbuf,smb_com) = SMBsendtxt;
+       SSVAL(cli->outbuf,smb_tid,cli->cnum);
+       cli_setup_packet(cli);
+
+       SSVAL(cli->outbuf,smb_vwv0,grp);
+       
+       p = smb_buf(cli->outbuf);
+       *p = 1;
+       SSVAL(p,1,len);
+       memcpy(p+3,msg,len);
+       cli_send_smb(cli, True);
+
+       if (!cli_receive_smb(cli)) {
+               return False;
+       }
+
+       if (cli_error(cli, NULL, NULL)) return False;
+
+       return True;
+}      
+
+/****************************************************************************
+end a message 
+****************************************************************************/
+BOOL cli_message_end(struct cli_state *cli, int grp)
+{
+       bzero(cli->outbuf,smb_size);
+       set_message(cli->outbuf,1,0,True);
+       CVAL(cli->outbuf,smb_com) = SMBsendend;
+       SSVAL(cli->outbuf,smb_tid,cli->cnum);
+
+       SSVAL(cli->outbuf,smb_vwv0,grp);
+
+       cli_setup_packet(cli);
+       
+       cli_send_smb(cli, True);
+
+       if (!cli_receive_smb(cli)) {
+               return False;
+       }
+
+       if (cli_error(cli, NULL, NULL)) return False;
+
+       return True;
+}      
+
+
+/****************************************************************************
+query disk space
+****************************************************************************/
+BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail)
+{
+       bzero(cli->outbuf,smb_size);
+       set_message(cli->outbuf,0,0,True);
+       CVAL(cli->outbuf,smb_com) = SMBdskattr;
+       SSVAL(cli->outbuf,smb_tid,cli->cnum);
+       cli_setup_packet(cli);
+
+       cli_send_smb(cli, True);
+       if (!cli_receive_smb(cli)) {
+               return False;
+       }
+
+       *bsize = SVAL(cli->inbuf,smb_vwv1)*SVAL(cli->inbuf,smb_vwv2);
+       *total = SVAL(cli->inbuf,smb_vwv0);
+       *avail = SVAL(cli->inbuf,smb_vwv3);
+       
+       return True;
+}