andrej spotted problem with connect_serverlist (starts off assuming
[samba.git] / source / libsmb / clientgen.c
index 72d7ca935b27b8ccaff33948c83a17ecf0356d30..fc0df84d4acf49c7311b1dc4069f3e60f3fa63f2 100644 (file)
 
 extern int DEBUGLEVEL;
 
+
+/****************************************************************************
+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.
 *******************************************************/
@@ -217,12 +267,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);
                }      
@@ -258,8 +307,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;
@@ -283,11 +331,9 @@ static BOOL cli_receive_trans(struct cli_state *cli,int trans,
        
        *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",
@@ -337,11 +383,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",
@@ -489,12 +533,12 @@ BOOL cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, c
   pstrcpy(p,"B13BWz");
   p = skip_string(p,1);
   SSVAL(p,0,1);
-  SSVAL(p,2,CLI_BUFFER_SIZE);
+  SSVAL(p,2,0xFFFF);
   p += 4;
 
   if (cli_api(cli, 
               param, PTR_DIFF(p,param), 1024,  /* Param, length, maxlen */
-              NULL, 0, CLI_BUFFER_SIZE,            /* data, length, maxlen */
+              NULL, 0, 0xFFFF,            /* data, length, maxlen */
               &rparam, &rprcnt,                /* return params, length */
               &rdata, &rdrcnt))                /* return data, length */
     {
@@ -502,20 +546,22 @@ BOOL cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, c
       int converter=SVAL(rparam,2);
       int i;
       
-      if (res == 0)
-       {
-         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);
-           }
-       }
+      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)
@@ -574,7 +620,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;
                                        
@@ -698,7 +744,7 @@ BOOL cli_session_setup(struct cli_state *cli,
                SIVAL(cli->outbuf,smb_vwv5,cli->sesskey);
                SSVAL(cli->outbuf,smb_vwv7,passlen);
                SSVAL(cli->outbuf,smb_vwv8,ntpasslen);
-               SSVAL(cli->outbuf,smb_vwv11,CAP_STATUS32);
+               SSVAL(cli->outbuf,smb_vwv11,0);
                p = smb_buf(cli->outbuf);
                memcpy(p,pword,passlen); 
                p += SVAL(cli->outbuf,smb_vwv7);
@@ -715,11 +761,12 @@ BOOL cli_session_setup(struct cli_state *cli,
                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;
@@ -728,6 +775,22 @@ BOOL cli_session_setup(struct cli_state *cli,
       /* 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;
 }
 
@@ -744,8 +807,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;
@@ -779,6 +842,7 @@ BOOL cli_send_tconX(struct cli_state *cli,
 
        slprintf(fullshare, sizeof(fullshare)-1,
                 "\\\\%s\\%s", cli->desthost, share);
+       strupper(fullshare);
 
        set_message(cli->outbuf,4,
                    2 + strlen(fullshare) + passlen + strlen(dev),True);
@@ -797,16 +861,25 @@ BOOL cli_send_tconX(struct cli_state *cli,
 
        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, smb_buf(cli->inbuf));
+       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 */
@@ -829,8 +902,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;
@@ -861,8 +934,8 @@ BOOL cli_rename(struct cli_state *cli, char *fname_src, char *fname_dst)
         *p++ = 4;
         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;
         }
 
@@ -895,8 +968,8 @@ BOOL cli_unlink(struct cli_state *cli, char *fname)
        *p++ = 4;      
        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;
        }
 
@@ -927,8 +1000,8 @@ BOOL cli_mkdir(struct cli_state *cli, char *dname)
        *p++ = 4;      
        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;
        }
 
@@ -959,8 +1032,8 @@ BOOL cli_rmdir(struct cli_state *cli, char *dname)
        *p++ = 4;      
        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;
        }
 
@@ -1004,8 +1077,8 @@ int cli_nt_create(struct cli_state *cli, char *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;
        }
 
@@ -1028,7 +1101,7 @@ int cli_open(struct cli_state *cli, char *fname, int flags, int share_mode)
 
        /* you must open for RW not just write - otherwise getattrE doesn't
           work! */
-       if ((flags & O_ACCMODE) == O_WRONLY) {
+       if ((flags & O_ACCMODE) == O_WRONLY && strncmp(cli->dev, "LPT", 3)) {
                flags = (flags & ~O_ACCMODE) | O_RDWR;
        }
 
@@ -1075,8 +1148,8 @@ int cli_open(struct cli_state *cli, char *fname, int flags, int share_mode)
        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;
        }
 
@@ -1107,8 +1180,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;
        }
 
@@ -1126,6 +1199,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);
@@ -1147,12 +1221,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);
+
+        cli->timeout = (timeout == -1) ? 0x7FFFFFFF : timeout;
 
-       send_smb(cli->fd,cli->outbuf);
-       if (!client_receive_smb(cli->fd,cli->inbuf,cli->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;
        }
@@ -1188,8 +1267,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;
        }
 
@@ -1224,7 +1303,7 @@ static void cli_issue_read(struct cli_state *cli, int fnum, off_t offset,
        SSVAL(cli->outbuf,smb_vwv6,size);
        SSVAL(cli->outbuf,smb_mid,cli->mid + i);
 
-       send_smb(cli->fd,cli->outbuf);
+       cli_send_smb(cli, True);
 }
 
 /****************************************************************************
@@ -1252,7 +1331,7 @@ size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t
                        issued++;
                }
 
-               if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout)) {
+               if (!cli_receive_smb(cli)) {
                        return total;
                }
 
@@ -1288,7 +1367,7 @@ size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t
        }
 
        while (received < issued) {
-               client_receive_smb(cli->fd,cli->inbuf,cli->timeout);
+               cli_receive_smb(cli);
                received++;
        }
        
@@ -1315,6 +1394,7 @@ static void cli_issue_write(struct cli_state *cli, int fnum, off_t offset, uint1
        
        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);
@@ -1329,8 +1409,7 @@ static void cli_issue_write(struct cli_state *cli, int fnum, off_t offset, uint1
 
        SSVAL(cli->outbuf,smb_mid,cli->mid + i);
        
-       show_msg(cli->outbuf);
-       send_smb(cli->fd,cli->outbuf);
+       cli_send_smb(cli, True);
 }
 
 /****************************************************************************
@@ -1340,9 +1419,9 @@ static void cli_issue_write(struct cli_state *cli, int fnum, off_t offset, uint1
               0x0004 use raw named pipe protocol
               0x0008 start of message mode named pipe protocol
 ****************************************************************************/
-size_t cli_write(struct cli_state *cli,
-                               int fnum, uint16 write_mode,
-                               char *buf, off_t offset, size_t size)
+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;
@@ -1366,7 +1445,7 @@ size_t cli_write(struct cli_state *cli,
                        issued++;
                }
 
-               if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout)) {
+               if (!cli_receive_smb(cli)) {
                        return total;
                }
 
@@ -1392,7 +1471,7 @@ size_t cli_write(struct cli_state *cli,
        }
 
        while (received < issued) {
-               client_receive_smb(cli->fd,cli->inbuf,cli->timeout);
+               cli_receive_smb(cli);
                received++;
        }
        
@@ -1404,7 +1483,7 @@ size_t cli_write(struct cli_state *cli,
 do a SMBgetattrE call
 ****************************************************************************/
 BOOL cli_getattrE(struct cli_state *cli, int fd, 
-                 uint32 *attr, size_t *size, 
+                 uint16 *attr, size_t *size, 
                  time_t *c_time, time_t *a_time, time_t *m_time)
 {
        bzero(cli->outbuf,smb_size);
@@ -1418,8 +1497,8 @@ BOOL cli_getattrE(struct cli_state *cli, int fd,
 
        SSVAL(cli->outbuf,smb_vwv0,fd);
 
-       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;
        }
        
@@ -1455,7 +1534,7 @@ BOOL cli_getattrE(struct cli_state *cli, int fd,
 do a SMBgetatr call
 ****************************************************************************/
 BOOL cli_getatr(struct cli_state *cli, char *fname, 
-               uint32 *attr, size_t *size, time_t *t)
+               uint16 *attr, size_t *size, time_t *t)
 {
        char *p;
 
@@ -1472,8 +1551,8 @@ BOOL cli_getatr(struct cli_state *cli, char *fname,
        *p = 4;
        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;
        }
        
@@ -1501,7 +1580,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;
 
@@ -1523,8 +1602,8 @@ BOOL cli_setatr(struct cli_state *cli, char *fname, int attr, time_t t)
        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;
        }
        
@@ -1540,7 +1619,7 @@ send a qpathinfo call
 ****************************************************************************/
 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, uint32 *mode)
+                  size_t *size, uint16 *mode)
 {
        int data_len = 0;
        int param_len = 0;
@@ -1615,7 +1694,8 @@ send a qpathinfo call with the SMB_QUERY_FILE_ALL_INFO info level
 ****************************************************************************/
 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, size_t *size, uint32 *mode)
+                   time_t *w_time, size_t *size, uint16 *mode,
+                   SMB_INO_T *ino)
 {
        int data_len = 0;
        int param_len = 0;
@@ -1661,11 +1741,14 @@ BOOL cli_qpathinfo2(struct cli_state *cli, const 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 (mode) {
-               *mode = IVAL(rdata, 32);
+       if (ino) {
+               *ino = IVAL(rdata, 64);
        }
 
        if (rdata) free(rdata);
@@ -1678,8 +1761,9 @@ BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname,
 send a qfileinfo call
 ****************************************************************************/
 BOOL cli_qfileinfo(struct cli_state *cli, int fnum, 
-                  uint32 *mode, size_t *size,
-                  time_t *c_time, time_t *a_time, time_t *m_time)
+                  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;
@@ -1687,11 +1771,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 */
@@ -1709,24 +1797,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 (size) {
-               *size = IVAL(rdata, 12);
+       if (w_time) {
+               *w_time = interpret_long_date(rdata+24) - cli->serverzone;
        }
        if (mode) {
-               *mode = SVAL(rdata,l1_attrFile);
+               *mode = SVAL(rdata, 32);
+       }
+       if (size) {
+               *size = IVAL(rdata, 40);
+       }
+       if (ino) {
+               *ino = IVAL(rdata, 64);
        }
 
        if (rdata) free(rdata);
@@ -1845,7 +1939,8 @@ static int interpret_long_filename(int level,char *p,file_info *finfo)
 /****************************************************************************
   do a directory listing, calling fn on each file found
   ****************************************************************************/
-int cli_list(struct cli_state *cli,char *Mask,int attribute,void (*fn)(file_info *))
+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. */
@@ -1996,7 +2091,7 @@ int cli_list(struct cli_state *cli,char *Mask,int attribute,void (*fn)(file_info
 
        for (p=dirlist,i=0;i<total_received;i++) {
                p += interpret_long_filename(info_level,p,&finfo);
-               fn(&finfo);
+               fn(&finfo, Mask);
        }
 
        /* free up the dirlist buffer */
@@ -2009,8 +2104,8 @@ int cli_list(struct cli_state *cli,char *Mask,int attribute,void (*fn)(file_info
 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];
@@ -2052,7 +2147,7 @@ BOOL cli_oem_change_password(struct cli_state *cli, char *user, char *new_passwo
   strupper(upper_case_old_pw);
   E_P16((uchar *)upper_case_old_pw, old_pw_hash);
 
-       if (!make_oem_passwd_hash( data, new_password, old_pw_hash))
+       if (!make_oem_passwd_hash( data, new_password, old_pw_hash, False))
        {
                return False;
        }
@@ -2070,13 +2165,14 @@ 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;
@@ -2130,11 +2226,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)) {
@@ -2212,10 +2308,10 @@ BOOL cli_session_request(struct cli_state *cli,
 retry:
 #endif /* WITH_SSL */
 
-       send_smb(cli->fd,cli->outbuf);
+       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
@@ -2239,23 +2335,24 @@ retry:
 /****************************************************************************
 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 || ip_equal(*ip, ipzero)) {
-                if (!resolve_name( cli->desthost, &dest_ip, 0x20)) {
+                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);
+       cli->fd = open_socket_out(SOCK_STREAM, &cli->dest_ip, 
+                                 139, cli->timeout);
        if (cli->fd == -1)
                return False;
 
@@ -2266,14 +2363,20 @@ 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)
-       {
+       if (!cli) {
+               cli = (struct cli_state *)malloc(sizeof(*cli));
+               if (!cli)
+                       return NULL;
+               ZERO_STRUCTP(cli);
+       }
+
+       if (cli->initialised) {
                cli_shutdown(cli);
        }
 
-       memset(cli, 0, sizeof(*cli));
+       ZERO_STRUCTP(cli);
 
        cli->fd = -1;
        cli->cnum = -1;
@@ -2293,7 +2396,7 @@ BOOL cli_initialise(struct cli_state *cli)
 
        cli->initialised = 1;
 
-       return True;
+       return cli;
 }
 
 /****************************************************************************
@@ -2301,6 +2404,7 @@ shutdown a client structure
 ****************************************************************************/
 void cli_shutdown(struct cli_state *cli)
 {
+       DEBUG(10,("cli_shutdown\n"));
        if (cli->outbuf)
        {
                free(cli->outbuf);
@@ -2314,7 +2418,9 @@ void cli_shutdown(struct cli_state *cli)
       sslutil_disconnect(cli->fd);
 #endif /* WITH_SSL */
        if (cli->fd != -1) 
-      close(cli->fd);
+       {
+               close(cli->fd);
+       }
        memset(cli, 0, sizeof(*cli));
 }
 
@@ -2329,10 +2435,18 @@ void cli_shutdown(struct cli_state *cli)
 ****************************************************************************/
 int cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num)
 {
-       int  flgs2 = SVAL(cli->inbuf,smb_flg2);
+       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;
 
@@ -2374,11 +2488,17 @@ int cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num)
                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 */
@@ -2404,17 +2524,17 @@ uint16 cli_setpid(struct cli_state *cli, uint16 pid)
 }
 
 /****************************************************************************
-establishes a connection right up to doing tconX, reading in a password.
+re-establishes a connection
 ****************************************************************************/
 BOOL cli_reestablish_connection(struct cli_state *cli)
 {
        struct nmb_name calling;
        struct nmb_name called;
        fstring dest_host;
-       struct in_addr dest_ip;
        fstring share;
        fstring dev;
        BOOL do_tcon = False;
+       int oldfd = cli->fd;
 
        if (!cli->initialised || cli->fd == -1)
        {
@@ -2434,16 +2554,26 @@ BOOL cli_reestablish_connection(struct cli_state *cli)
        memcpy(&called , &(cli->called ), sizeof(called ));
        memcpy(&calling, &(cli->calling), sizeof(calling));
        fstrcpy(dest_host, cli->full_dest_host_name);
-       dest_ip = cli->dest_ip;
 
        DEBUG(5,("cli_reestablish_connection: %s connecting to %s (ip %s) - %s [%s]\n",
-                         namestr(&calling), namestr(&called), inet_ntoa(dest_ip),
-                     cli->user_name, cli->domain));
+                nmb_namestr(&calling), nmb_namestr(&called), 
+                inet_ntoa(cli->dest_ip),
+                cli->user_name, cli->domain));
+
+       cli->fd = -1;
 
-       return cli_establish_connection(cli,
-                                       dest_host, &dest_ip,
-                                       &calling, &called,
-                                       share, dev, False, do_tcon);
+       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;
 }
 
 /****************************************************************************
@@ -2456,7 +2586,7 @@ BOOL cli_establish_connection(struct cli_state *cli,
                                BOOL do_shutdown, BOOL do_tcon)
 {
        DEBUG(5,("cli_establish_connection: %s connecting to %s (%s) - %s [%s]\n",
-                         namestr(calling), namestr(called), inet_ntoa(*dest_ip),
+                         nmb_namestr(calling), nmb_namestr(called), inet_ntoa(*dest_ip),
                      cli->user_name, cli->domain));
 
        /* establish connection */
@@ -2471,7 +2601,7 @@ BOOL cli_establish_connection(struct cli_state *cli,
                if (!cli_connect(cli, dest_host, dest_ip))
                {
                        DEBUG(1,("cli_establish_connection: failed to connect to %s (%s)\n",
-                                         namestr(calling), inet_ntoa(*dest_ip)));
+                                         nmb_namestr(calling), inet_ntoa(*dest_ip)));
                        return False;
                }
        }
@@ -2494,15 +2624,25 @@ BOOL cli_establish_connection(struct cli_state *cli,
 
        if (cli->pwd.cleartext || cli->pwd.null_pwd)
        {
-               /* attempt clear-text session */
-
                fstring passwd;
+               int pass_len;
 
-               pwd_get_cleartext(&(cli->pwd), passwd);
+               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, strlen(passwd),
+                              passwd, pass_len,
                               NULL, 0,
                               cli->domain))
                {
@@ -2545,7 +2685,9 @@ BOOL cli_establish_connection(struct cli_state *cli,
                {
                        DEBUG(1,("failed session setup\n"));
                        if (do_shutdown)
-              cli_shutdown(cli);
+                       {
+                               cli_shutdown(cli);
+                       }
                        return False;
                }
 
@@ -2556,19 +2698,104 @@ BOOL cli_establish_connection(struct cli_state *cli,
                        {
                                DEBUG(1,("failed tcon_X\n"));
                                if (do_shutdown)
-                  cli_shutdown(cli);
+                               {
+                                       cli_shutdown(cli);
+                               }
                                return False;
                        }
                }
        }
 
        if (do_shutdown)
-      cli_shutdown(cli);
+       {
+               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;
+       BOOL connected_ok = False;
+
+       ZERO_STRUCTP(cli);
+
+       if (!cli_initialise(cli))
+       {
+               DEBUG(0,("cli_connect_serverlist: unable to initialize client connection.\n"));
+               return 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)))
+       {
+               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 (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);
+
+               pwd_set_nullpwd(&cli->pwd);
+
+               if (!cli_establish_connection(cli, remote_machine, &dest_ip,
+                                             &calling, &called,
+                                             "IPC$", "IPC", 
+                                             False, True))
+               {
+                       cli_shutdown(cli);
+                       continue;
+               }      
+
+               if (!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
   ****************************************************************************/
@@ -2677,3 +2904,154 @@ int cli_print_queue(struct cli_state *cli,
 
        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;
+}