Changeset 883

Timestamp:

May 12, 2015, 2:32:32 PM (10 years ago)

Author:

Silvan Scherrer

Message:

Samba client: update trunk to 3.6 server level, change client version to 2.3

Location:

trunk/client/src

Files:

• Makefile.kmk (modified) (2 diffs)
• help/changelog.txt (modified) (1 diff)
• help/ndpsmb.ipf (modified) (1 diff)
• help/ndpsmb_de.ipf (modified) (1 diff)
• help/ndpsmb_fr.ipf (modified) (1 diff)
• smbwrp.c (modified) (21 diffs)

trunk/client/src/Makefile.kmk

@@ -53 +53 @@
                 $(SAMBA)/lib/tevent
 
-ndpsmb_LIBS = libsmbclient.a socket.a libtalloc.a libtdb.a libwbclient.a z
+ndpsmb_LIBS = libsmbclient libtalloc libtdb libwbclient libtevent z mmap
 ndpsmb_LIBS += $(GCC_LIB)/binmode.obj
 ndpsmb_LIBPATH = $(SAMBA)/source3/bin $(Z_LIBDIR)
@@ -162 +162 @@
         $(QUIET)$(MKDIR) -p $(PATH_OUT)/dist                              
         $(QUIET)$(RM) -f $@
-        $(QUIET)$(REDIRECT) -C $(PATH_INST_BIN) -- zip -Sr9 $@ \*
+        $(QUIET)$(REDIRECT) -C $(PATH_INST_BIN) -- zip -9Sr $@ .
 
 

trunk/client/src/help/changelog.txt

@@ -903 +903 @@
 :eul.:eul.
 #endif
+
+#ifdef txt
+Version 2.3
+#endif
+#ifndef txt
+:h2 res=016.Version 2.3
+:p.
+:ul.
+#endif
+ <$UL>beta1:
+#ifndef txt
+:ul compact.
+#endif
+#ifdef en
+   <$LI> moved to samba 3.6 source base
+#endif
+#ifdef fr
+   <$LI> Passage 
+ la version 3.6 du code du client Samba.
+#endif
+#ifdef de
+   <$LI> Update auf Samba 3.6 Client-Code
+#endif
+#ifndef txt
+:eul.
+#endif
+
+#ifndef txt
+:eul.:eul.
+#endif

trunk/client/src/help/ndpsmb.ipf

@@ -150 +150 @@
 :li.:link reftype=hd res=014.Version 2.1:elink.
 :li.:link reftype=hd res=015.Version 2.2:elink.
+:li.:link reftype=hd res=016.Version 2.3:elink.
 :eul.
 #include <changelog.txt>

trunk/client/src/help/ndpsmb_de.ipf

@@ -151 +151 @@
 :li.:link reftype=hd res=014.Version 2.1:elink.
 :li.:link reftype=hd res=015.Version 2.2:elink.
+:li.:link reftype=hd res=016.Version 2.3:elink.
 :eul.
 #include <changelog.txt>

trunk/client/src/help/ndpsmb_fr.ipf

@@ -241 +241 @@
 :li.:link reftype=hd res=014.Version 2.1:elink.
 :li.:link reftype=hd res=015.Version 2.2:elink.
+:li.:link reftype=hd res=016.Version 2.3:elink.
 :eul.
 #include <changelog.txt>

trunk/client/src/smbwrp.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "rpc_client/cli_pipe.h"
+#include "librpc/gen_ndr/ndr_srvsvc_c.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/clirap.h"
+#include "trans2.h"
 #include "smbwrp.h"
-/****************************************************************************
- Calculate a safe next_entry_offset.
-****************************************************************************/
-
-static size_t calc_next_entry_offset(const char *base, const char *pdata_end)
-{
-        size_t next_entry_offset = (size_t)IVAL(base,0);
-
-        if (next_entry_offset == 0 ||
-                        base + next_entry_offset < base ||
-                        base + next_entry_offset > pdata_end) {
-                next_entry_offset = pdata_end - base;
-        }
-        return next_entry_offset;
-}
-
-static int
-net_share_enum_rpc(struct cli_state *cli,
-                void (*fn)(const char *name,
-                uint32 type,
-                const char *comment,
-                void *state),
-                void *state)
-{
-        int i;
-        NTSTATUS status;
-        WERROR werr;
-        uint32_t resume_handle = 0;
-        uint32_t total_entries = 0;
-        struct srvsvc_NetShareInfoCtr info_ctr;
-        struct srvsvc_NetShareCtr1 ctr1;
-        fstring name = "";
-        fstring comment = "";
-        void *mem_ctx;
-        struct rpc_pipe_client *pipe_hnd;
-
-        /* Open the server service pipe */
-        status = cli_rpc_pipe_open_noauth(cli, &ndr_table_srvsvc.syntax_id, &pipe_hnd);
-        if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(1, ("net_share_enum_rpc pipe open fail!\n"));
-                return -1;
-        }
-
-        /* Allocate a context for parsing and for the entries in "ctr" */
-        mem_ctx = talloc_init("libsmbclient: net_share_enum_rpc");
-        if (mem_ctx == NULL) {
-                DEBUG(0, ("out of memory for net_share_enum_rpc!\n"));
-                TALLOC_FREE(pipe_hnd);
-                return -1; 
-        }
-
-        /* Issue the NetShareEnum RPC call and retrieve the response */
-        ZERO_STRUCT(info_ctr);
-        ZERO_STRUCT(ctr1);
-        info_ctr.level = 1;
-        info_ctr.ctr.ctr1 = &ctr1;
-        status = rpccli_srvsvc_NetShareEnumAll(pipe_hnd, mem_ctx,
-                                                pipe_hnd->desthost,
-                                                &info_ctr,
-                                                0xffffffff,
-                                                &total_entries,
-                                                &resume_handle, 
-                                                &werr);
-
-        /* Was it successful? */
-        if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(werr) || info_ctr.ctr.ctr1->count == 0) {
-                /*  Nope.  Go clean up. */
-                goto done;
-        }
-
-        /* For each returned entry... */
-        for (i = 0; i < info_ctr.ctr.ctr1->count; i++) {
-                struct srvsvc_NetShareInfo1 info = info_ctr.ctr.ctr1->array[i];
-
-                /* Add this share to the list */
-                (*fn)(info.name, info.type, info.comment, state);
-        }
-
-done:
-        /* Close the server service pipe */
-        TALLOC_FREE(pipe_hnd);
-
-        /* Free all memory which was allocated for this request */
-        TALLOC_FREE(mem_ctx);
-
-        /* Tell 'em if it worked */
-        return W_ERROR_IS_OK(status) ? 0 : -1;
-}
 
 /*
@@ -300 +217 @@
 #endif
 
-
-/****************************************************************************
-send a qpathinfo call with the SMB_QUERY_FILE_ALL_INFO info level
-****************************************************************************/
-bool cli_qpathinfo3(struct cli_state *cli, const char *fname, 
-                    time_t *c_time, time_t *a_time, time_t *m_time, 
-                    time_t *w_time, off_t *size, uint16 *mode,
-                    SMB_INO_T *ino)
-{
-        unsigned int data_len = 0;
-        unsigned int param_len = 0;
-        uint16 setup = TRANSACT2_QPATHINFO;
-        char *param;
-        size_t nlen = 2*(strlen(fname)+1);
-        char *rparam=NULL, *rdata=NULL;
-        char *p;
-
-        param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
-        if (!param) {
-                return false;
-        }
-
-        p = param;
-        memset(p, '\0', 6);
-        SSVAL(p, 0, SMB_QUERY_FILE_ALL_INFO);
-        p += 6;
-        p += clistr_push(cli, p, fname, nlen, STR_TERMINATE);
-
-        param_len = PTR_DIFF(p, param);
-
-        if (!cli_send_trans(cli, SMBtrans2, 
-                        NULL,                           /* name */
-                        -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 */
-                        )) {
-                return False;
-        }
-
-        SAFE_FREE(param);
-        if (!cli_receive_trans(cli, SMBtrans2,
-                        &rparam, &param_len,
-                        &rdata, &data_len)) {
-                return False;
-        }
-
-        if (!rdata || data_len < 22) {
-                return False;
-        }
-
-        if (c_time) {
-                *c_time = convert_timespec_to_time_t(interpret_long_date(rdata+0));
-        }
-        if (a_time) {
-                *a_time = convert_timespec_to_time_t(interpret_long_date(rdata+8));
-        }
-        if (m_time) {
-                *m_time = convert_timespec_to_time_t(interpret_long_date(rdata+16));
-        }
-        if (w_time) {
-                *w_time = convert_timespec_to_time_t(interpret_long_date(rdata+24));
-        }
-        if (mode) {
-                *mode = SVAL(rdata, 32);
-        }
-        if (size) {
-                *size = IVAL2_TO_SMB_BIG_UINT(rdata, 48);
-        }
-        if (ino) {
-                *ino = IVAL(rdata, 64);
-        }
-
-        SAFE_FREE(rdata);
-        SAFE_FREE(rparam);
-        return True;
-}
-
-/****************************************************************************
-send a qfileinfo call
-****************************************************************************/
-bool cli_qfileinfo3(struct cli_state *cli, int fnum, 
-                   uint16 *mode, off_t *size,
-                   time_t *c_time, time_t *a_time, time_t *m_time, 
-                   time_t *w_time, SMB_INO_T *ino)
-{
-        unsigned int data_len = 0;
-        unsigned int param_len = 0;
-        uint16 setup = TRANSACT2_QFILEINFO;
-        char param[4];
-        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;
-
-        SSVAL(param, 0, fnum);
-        SSVAL(param, 2, SMB_QUERY_FILE_ALL_INFO);
-
-        if (!cli_send_trans(cli, SMBtrans2, 
-                        NULL,                           /* name */
-                        -1, 0,                          /* fid, flags */
-                        &setup, 1, 0,                   /* setup, length, max */
-                        param, param_len, 2,            /* param, length, max */
-                        NULL, data_len, cli->max_xmit   /* data, length, max */
-                        )) {
-                return False;
-        }
-
-        if (!cli_receive_trans(cli, SMBtrans2,
-                        &rparam, &param_len,
-                        &rdata, &data_len)) {
-                return False;
-        }
-
-        if (!rdata || data_len < 68) {
-                return False;
-        }
-
-        if (c_time) {
-                *c_time = convert_timespec_to_time_t(interpret_long_date(rdata+0));
-        }
-        if (a_time) {
-                *a_time = convert_timespec_to_time_t(interpret_long_date(rdata+8));
-        }
-        if (m_time) {
-                *m_time = convert_timespec_to_time_t(interpret_long_date(rdata+16));
-        }
-        if (w_time) {
-                *w_time = convert_timespec_to_time_t(interpret_long_date(rdata+24));
-        }
-        if (mode) {
-                *mode = SVAL(rdata, 32);
-        }
-        if (size) {
-                *size = IVAL2_TO_SMB_BIG_UINT(rdata, 48);
-        }
-        if (ino) {
-                *ino = IVAL(rdata, 64);
-        }
-
-        SAFE_FREE(rdata);
-        SAFE_FREE(rparam);
-        return True;
-}
-
 /***************************************************** 
 return a connection to a server
@@ -671 +440 @@
 int _System smbwrp_write(cli_state * cli, smbwrp_file * file, void *buf, unsigned long count, unsigned long * result)
 {
-        int ret;
+        NTSTATUS status;
+        size_t ret;
 
         if (!cli || !file || !buf || !result) 
@@ -680 +450 @@
         *result = 0;
 //debuglocal(1,("Write %x %d %lld %d", cli, file->fd, file->offset, count));
-        ret = cli_write(cli, file->fd, 0, buf, file->offset, count);
-        if (ret == -1) 
-        {
+        status = cli_writeall(cli, file->fd, 0, buf, file->offset, count, &ret);
+        if (!NT_STATUS_IS_OK(status)) {
                 return os2cli_errno(cli);
         }
@@ -719 +488 @@
         {
                 debuglocal(4,"Set pathinfo on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->ctime);
-                if (!NT_STATUS_IS_OK(cli_setpathinfo(cli, file->fname, file->ctime, 0, file->mtime, 0, file->openattr))) 
+                if (!NT_STATUS_IS_OK(cli_setpathinfo_basic(cli, file->fname, file->ctime, 0, file->mtime, 0, file->openattr))) 
                 {
                         debuglocal(4,"Set pathinfo on close failed %d\n", os2cli_errno(cli));
@@ -736 +505 @@
 }
 
-/***************************************************** 
-a wrapper for setfilesize()
-*******************************************************/
-int cli_setfilenewsize(struct cli_state *cli, int fnum, off_t newsize)
-{
-        unsigned int data_len = 8;
-        unsigned int param_len = 6;
-        uint16 setup = TRANSACT2_SETFILEINFO;
-        char param[6];
-        unsigned char data[8];
-        char *rparam=NULL, *rdata=NULL;
-
-        SSVAL(param,0,fnum);
-        SSVAL(param,2,SMB_SET_FILE_END_OF_FILE_INFO);
-        SSVAL(param,4,0);
-
-        SBVAL(data, 0, newsize);
-
-        if (!cli_send_trans(cli, SMBtrans2,
-                                                NULL,                   /* name */
-                                                -1, 0,                    /* fid, flags */
-                                                &setup, 1, 0,              /* setup, length, max */
-                                                param, param_len, 2,        /* param, length, max */
-                                                (char *)&data,  data_len,       /* data, length */
-                                                cli->max_xmit /* max */
-                                                )) {
-                return False;
-        }
-
-        if (!cli_receive_trans(cli, SMBtrans2,
-                                                &rparam, &param_len,
-                                                &rdata, &data_len)) {
-                return False;
-        }
-
-        SAFE_FREE(rdata);
-        SAFE_FREE(rparam);
-
-        return True;
-}
-
 int _System smbwrp_setfilesize(cli_state * cli, smbwrp_file * file, long long newsize)
 {
@@ -786 +514 @@
 
         debuglocal(4,"cli_setnewfilesize(%s) %lld\n", file->fname, newsize);
-        if (!cli_setfilenewsize(cli, file->fd, newsize))
+        if (!NT_STATUS_IS_OK(cli_ftruncate(cli, file->fd, newsize)))
         {
                 if (newsize)
@@ -823 +551 @@
 
         debuglocal(1,"Rename <%s> -> <%s>\n", oldname, newname);
-        //cli_unlink(cli, newname);
-//      if (!cli_rename(cli, oldname, newname) && !cli_ntrename(cli, oldname, newname)) 
         if (!NT_STATUS_IS_OK(cli_rename(cli, oldname, newname)))
         {
@@ -913 +639 @@
                         return maperror(EINVAL);
                 }
-                if (!cli_qfileinfo3(cli, file->fd, 
+                if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(cli, file->fd, 
                                    NULL, &size, NULL, NULL, NULL, 
-                                   NULL, NULL) &&
+                                   NULL, NULL)) &&
                     !NT_STATUS_IS_OK(cli_getattrE(cli, file->fd, 
                                   NULL, &size, NULL, NULL, NULL)))
@@ -936 +662 @@
 {
         SMB_INO_T ino = 0;
+        struct timespec ctime;
+        struct timespec mtime;
+        struct timespec atime;
+
         if (!cli || !finfo || !*finfo->fname) 
         {
@@ -942 +672 @@
         debuglocal(4,"getattr %d %d <%s>\n", cli->capabilities & CAP_NOPATHINFO2, cli->capabilities & CAP_NT_SMBS, finfo->fname);
         if (!(cli->capabilities & CAP_NOPATHINFO2) &&
-                cli_qpathinfo3(cli, finfo->fname, (time_t *)&finfo->ctime, (time_t *)&finfo->atime, (time_t *)&finfo->mtime, NULL,
+                cli_qpathinfo2(cli, finfo->fname, &ctime, &atime, &mtime, NULL,
                            (off_t *)&finfo->size, (unsigned short *)&finfo->attr, &ino))
         {
                 finfo->attr &= 0x7F;
-//debuglocal(2,("gotattr %08x <%s>\n", finfo->attr, finfo->fname));
-//              finfo->ctime -= get_time_zone(finfo->ctime);
-//              finfo->atime -= get_time_zone(finfo->atime);
-//              finfo->mtime -= get_time_zone(finfo->mtime);
+                finfo->ctime = convert_timespec_to_time_t(ctime);
+                finfo->atime = convert_timespec_to_time_t(atime);
+                finfo->mtime = convert_timespec_to_time_t(mtime);
                 return 0;
         }
-//debuglocal(2,("getattr rc1 %d\n", os2cli_errno(cli)));
 
         if (cli->fd == -1)
@@ -961 +689 @@
 
         /* If the path is not on a share (it is a workgroup or a server),
-         * then cli_qpathinfo3 obviously fails. Return some fake information
+         * then cli_qpathinfo2 obviously fails. Return some fake information
          * about the directory.
          */
@@ -1013 +741 @@
 int _System smbwrp_fgetattr(cli_state * cli, smbwrp_file *file, smbwrp_fileinfo *finfo)
 {
+        struct timespec ctime;
+        struct timespec mtime;
+        struct timespec atime;
         SMB_INO_T ino = 0;
+
         if (!cli || !file || !finfo) 
         {
@@ -1020 +752 @@
 
         strncpy(finfo->fname, file->fname, sizeof(finfo->fname) - 1);
-        if (!cli_qfileinfo3(cli, file->fd, 
-                           (unsigned short *)&finfo->attr, (off_t *)&finfo->size, (time_t *)&finfo->ctime, (time_t *)&finfo->atime, (time_t *)&finfo->mtime, NULL,
-                           &ino))
+        if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(cli, file->fd, 
+                           (unsigned short *)&finfo->attr, (off_t *)&finfo->size, &ctime, &atime, &mtime, NULL,
+                           &ino)))
         {
                 if (!NT_STATUS_IS_OK(cli_getattrE(cli, file->fd, 
@@ -1038 +770 @@
         else
         {
-//              finfo->ctime -= get_time_zone(finfo->ctime);
-//              finfo->atime -= get_time_zone(finfo->atime);
-//              finfo->mtime -= get_time_zone(finfo->mtime);
+                finfo->ctime = convert_timespec_to_time_t(ctime);
+                finfo->atime = convert_timespec_to_time_t(atime);
+                finfo->mtime = convert_timespec_to_time_t(mtime);
         }
 
@@ -1118 +850 @@
 
 /****************************************************************************
- 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
+ Do a directory listing, calling fn on each file found.
+ Modified from cli_list
 ****************************************************************************/
-// YD from libsmb\clilist.c
-static size_t _os2_interpret_long_filename(TALLOC_CTX *ctx, struct cli_state *cli,
-                                   int level,const char *p, const char *pdata_end, smbwrp_fileinfo *finfo,
-                                        uint32 *p_resume_key, DATA_BLOB *p_last_name_raw)
-{
-        int len;
-        const char *base = p;
-        size_t ret;
-        char *fname;
-        
-        data_blob_free(p_last_name_raw);
-
-        if (p_resume_key) {
-                *p_resume_key = 0;
-        }
-
-/*      ZERO_STRUCTP(finfo); */
-        finfo->atime = 0;
-        finfo->ctime = 0;
-        finfo->mtime = 0;
-        *finfo->fname = '\0';
-        
-        switch (level) {
-                case SMB_FIND_INFO_STANDARD: /* OS/2 understands this */
-                        /* these dates are converted to GMT by
-                           make_unix_date */
-                        if (pdata_end - base < 27) {
-                                return pdata_end - base;
-                        }
-                        finfo->ctime = cli_make_unix_date2(cli, p+4) - cli->serverzone;
-                        finfo->atime = cli_make_unix_date2(cli, p+8) - cli->serverzone;
-                        finfo->mtime = cli_make_unix_date2(cli, p+12) - cli->serverzone;
-                        finfo->size = IVAL(p,16);
-                        finfo->attr = CVAL(p,24);
-                        len = CVAL(p, 26);
-                        p += 27;
-                        p += clistr_align_in(cli, p, 0);
-
-                        /* We can safely use len here (which is required by OS/2)
-                         * and the NAS-BASIC server instead of +2 or +1 as the
-                         * STR_TERMINATE flag below is
-                         * actually used as the length calculation.
-                         * The len is merely an upper bound.
-                         * Due to the explicit 2 byte null termination
-                         * in cli_receive_trans/cli_receive_nt_trans
-                         * we know this is safe. JRA + kukks
-                         */
-
-                        if (p + len > pdata_end) {
-                                return pdata_end - base;
-                        }
-
-                        /* the len+2 below looks strange but it is
-                           important to cope with the differences
-                           between win2000 and win9x for this call
-                           (tridge) */
-                        ret = clistr_pull_talloc(ctx, cli->inbuf, &fname, p,
-                                         len+2,
-                                         STR_TERMINATE);
-                        if (ret == (size_t)-1) {
-                                return pdata_end - base;
-                        }
-                        p += ret;
-                        finfo->easize = -1;
-                        strncat(finfo->fname, fname, sizeof(finfo->fname) -1);
-                        return PTR_DIFF(p, base);
-
-                case SMB_FIND_EA_SIZE: /* this is what OS/2 uses mostly */
-                        /* these dates are converted to GMT by
-                           make_unix_date */
-                        if (pdata_end - base < 31) {
-                                return pdata_end - base;
-                        }
-                        finfo->ctime = cli_make_unix_date2(cli, p+4) - cli->serverzone;
-                        finfo->atime = cli_make_unix_date2(cli, p+8) - cli->serverzone;
-                        finfo->mtime = cli_make_unix_date2(cli, p+12) - cli->serverzone;
-                        finfo->size = IVAL(p,16);
-                        finfo->attr = CVAL(p,24);
-                        finfo->easize = IVAL(p,26);
-                        len = CVAL(p, 30);
-                        p += 31;
-                        /* check for unisys! */
-                        if (p + len + 1 > pdata_end) {
-                                return pdata_end - base;
-                        }
-                        ret = clistr_pull_talloc(ctx, cli->inbuf, &fname, p,
-                                         len, 
-                                         STR_NOALIGN);
-                        if (ret == (size_t)-1) {
-                                return pdata_end - base;
-                        }
-                        p += ret;
-                        strncat(finfo->fname, fname, sizeof(finfo->fname) -1);
-                        return PTR_DIFF(p, base) + 1;
-                        
-                case SMB_FIND_FILE_BOTH_DIRECTORY_INFO: /* NT uses this, but also accepts 2 */
-                {
-                        size_t namelen, slen;
-
-                        if (pdata_end - base < 94) {
-                                return pdata_end - base;
-                        }
-
-                        p += 4; /* next entry offset */
-
-                        if (p_resume_key) {
-                                *p_resume_key = IVAL(p,0);
-                        }
-
-                        p += 4; /* fileindex */
-                                
-                        /* Offset zero is "create time", not "change time". */
-                        p += 8;
-                        finfo->atime = interpret_long_date(p).tv_sec;
-                        p += 8;
-                        finfo->mtime = interpret_long_date(p).tv_sec;
-                        p += 8;
-                        finfo->ctime = interpret_long_date(p).tv_sec;
-                        p += 8;
-                        finfo->size = IVAL2_TO_SMB_BIG_UINT(p,0);
-                        p += 8;
-                        p += 8; /* alloc size */
-                        finfo->attr = CVAL(p,0);
-                        p += 4;
-                        namelen = IVAL(p,0);
-                        p += 4;
-                        finfo->easize = IVAL(p,0);
-                        p += 4; /* EA size */
-                        slen = SVAL(p, 0);
-                        if (slen > 24) {
-                                /* Bad short name length. */
-                                return pdata_end - base;
-                        }
-                        p += 2; 
-#if 0                   
-                        {
-                                /* stupid NT bugs. grr */
-                                int flags = 0;
-                                if (p[1] == 0 && namelen > 1) flags |= STR_UNICODE;
-                                clistr_pull(cli, finfo->short_name, p,
-                                            sizeof(finfo->short_name),
-                                            slen, flags);
-                        }
-#endif
-                        p += 24; /* short name? */
-                        if (p + namelen < p || p + namelen > pdata_end) {
-                                return pdata_end - base;
-                        }         
-                        ret = clistr_pull_talloc(ctx, cli->inbuf, &fname, p,
-                                    namelen, 0);
-                        if (ret == (size_t)-1) {
-                                return pdata_end - base;
-                        }
-                        strncat(finfo->fname, fname, sizeof(finfo->fname) -1);
-
-                        /* To be robust in the face of unicode conversion failures
-                           we need to copy the raw bytes of the last name seen here.
-                           Namelen doesn't include the terminating unicode null, so
-                           copy it here. */
-#if 0
-                        if (p_last_name_raw) {
-                                *p_last_name_raw = data_blob(NULL, namelen+2);
-                                memcpy(p_last_name_raw->data, p, namelen);
-                                SSVAL(p_last_name_raw->data, namelen, 0);
-                        }
-#endif
-                        return calc_next_entry_offset(base, pdata_end);
-                }
-        }
-        
-        debuglocal(1,"Unknown long filename format %d\n",level);
-        return calc_next_entry_offset(base, pdata_end);
-}
-
-/****************************************************************************
- Do a directory listing, calling fn on each file found.
- Modified from cli_list_new
-****************************************************************************/
-
-static int list_files(struct cli_state *cli, const char *Mask, uint16 attribute, 
-                 void (*fn)(const char*, smbwrp_fileinfo *, const char *, void *), void *state)
-{
-#if 1
-        int max_matches = 1366; /* Match W2k - was 512. */
-#else
-        int max_matches = 512;
-#endif
-        int info_level;
-        char *p, *p2, *rdata_end;
-        char *mask=NULL;
-        smbwrp_fileinfo finfo;
-        int i;
-        char *dirlist = NULL;
-        int dirlist_len = 0;
-        int total_received = -1;
-        bool First = True;
-        int ff_searchcount=0;
-        int ff_eos=0;
-        int ff_dir_handle=0;
-        int loop_count = 0;
-        char *rparam=NULL, *rdata=NULL;
-        unsigned int param_len, data_len;       
-        uint16 setup;
-        char *param;
-        uint32 resume_key = 0;
+static int list_files(struct cli_state *cli, const char *mask, uint16 attribute,
+                  void (*fn)(const char *, smbwrp_fileinfo *, const char *,
+                             void *), void *state)
+{
         TALLOC_CTX *frame = talloc_stackframe();
-        DATA_BLOB last_name_raw = data_blob(NULL, 0);
-
-        /* NT uses SMB_FIND_FILE_BOTH_DIRECTORY_INFO,
-         OS/2 uses SMB_FIND_EA_SIZE. Both accept SMB_FIND_INFO_STANDARD. */
-        info_level = (cli->capabilities&CAP_NT_SMBS)?
-           SMB_FIND_FILE_BOTH_DIRECTORY_INFO : SMB_FIND_EA_SIZE; 
-        
-        debuglocal(4,"list_files level %d. mask <%s>\n", info_level, Mask);
-   
-        mask = SMB_STRDUP(Mask);
-        if (!mask) {
-                TALLOC_FREE(frame);
-                return -1;
-        }
+        struct event_context *ev;
+        struct tevent_req *req;
+        NTSTATUS status = NT_STATUS_NO_MEMORY;
+        struct file_info *finfo;
+        size_t i, num_finfo;
+        uint16_t info_level;
+        void *dircachectx = NULL;
+        smbwrp_fileinfo wrpfinfo;
 
         /* Try to get the listing from cache. */
-        if (dircache_list_files(fn, state, &total_received))
+        if (dircache_list_files(fn, state, &num_finfo))
         {
                 /* Got from cache. */
-                return(total_received);
-        }
-
-        while (ff_eos == 0) {
-                size_t nlen = 2*(strlen(mask)+1);
-
-                loop_count++;
-                if (loop_count > 200) {
-                        debuglocal(0,"Error: Looping in FIND_NEXT??\n");
-                        break;
-                }
-
-                param = SMB_MALLOC_ARRAY(char, 12+nlen+last_name_raw.length+2);
-                if (!param) {
-                        break;
-                }
-
-                if (First) {
-                        setup = TRANSACT2_FINDFIRST;
-                        SSVAL(param,0,attribute); /* attribute */
-                        SSVAL(param,2,max_matches); /* max count */
-                        SSVAL(param,4,(FLAG_TRANS2_FIND_REQUIRE_RESUME|FLAG_TRANS2_FIND_CLOSE_IF_END)); /* resume required + close on end */
-                        SSVAL(param,6,info_level); 
-                        SIVAL(param,8,0);
-                        p = param+12;
-                        p += clistr_push(cli, param+12, mask, nlen, 
-                                         STR_TERMINATE);
-                } else {
-                        setup = TRANSACT2_FINDNEXT;
-                        SSVAL(param,0,ff_dir_handle);
-                        SSVAL(param,2,max_matches); /* max count */
-                        SSVAL(param,4,info_level); 
-                        /* For W2K servers serving out FAT filesystems we *must* set the
-                           resume key. If it's not FAT then it's returned as zero. */
-                        SIVAL(param,6,resume_key); /* ff_resume_key */
-                        /* NB. *DON'T* use continue here. If you do it seems that W2K and bretheren
-                           can miss filenames. Use last filename continue instead. JRA */
-                        SSVAL(param,10,(FLAG_TRANS2_FIND_REQUIRE_RESUME|FLAG_TRANS2_FIND_CLOSE_IF_END));        /* resume required + close on end */
-                        p = param+12;
-                        if (last_name_raw.length) {
-                                memcpy(p, last_name_raw.data, last_name_raw.length);
-                                p += last_name_raw.length;
-                        } else {
-                                p += clistr_push(cli, param+12, mask,
-                                              nlen, STR_TERMINATE);
-                        }
-                }
-
-                param_len = PTR_DIFF(p, param);
-
-                if (!cli_send_trans(cli, SMBtrans2, 
-                                    NULL,                  /* Name */
-                                    -1, 0,                /* fid, flags */
-                                    &setup, 1, 0,          /* setup, length, max */
-                                    param, param_len, 10,   /* param, length, max */
-                                    NULL, 0, 
-#if 0
-                                    /* w2k value. */
-                                    MIN(16384,cli->max_xmit) /* data, length, max. */
-#else
-                                    cli->max_xmit           /* data, length, max. */
-#endif
-                                    )) {
-                        SAFE_FREE(param);
-                        TALLOC_FREE(frame);
-                        break;
-                }
-
-                SAFE_FREE(param);
-
-                if (!cli_receive_trans(cli, SMBtrans2, 
-                                       &rparam, &param_len,
-                                       &rdata, &data_len) &&
-                    cli_is_dos_error(cli)) {
-                        /* we need to work around a Win95 bug - sometimes
-                           it gives ERRSRV/ERRerror temprarily */
-                        uint8 eclass;
-                        uint32 ecode;
-
-                        SAFE_FREE(rdata);
-                        SAFE_FREE(rparam);
-
-                        cli_dos_error(cli, &eclass, &ecode);
-
-                        /*
-                         * OS/2 might return "no more files",
-                         * which just tells us, that searchcount is zero
-                         * in this search.
-                         * Guenter Kukkukk <linux@kukkukk.com>
-                         */
-
-                        if (eclass == ERRDOS && ecode == ERRnofiles) {
-                                ff_searchcount = 0;
-                                cli_reset_error(cli);
-                                break;
-                        }
-
-                        if (eclass != ERRSRV || ecode != ERRerror)
-                                break;
-                        smb_msleep(100);
-                        continue;
-                }
-
-                if (cli_is_error(cli) || !rdata || !rparam) 
-                {
-                        if (First && info_level == SMB_FIND_EA_SIZE)
-                        {
-                                // we have tried query ea size, but now will try without ea size
-                                info_level = SMB_FIND_INFO_STANDARD;
-                                debuglocal(4,"list_files fallback to level %d\n", info_level);
-                                continue;
-                        }
-                        SAFE_FREE(rdata);
-                        SAFE_FREE(rparam);
-                        break;
-                }
-
-                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);
-                } else {
-                        ff_searchcount = SVAL(p,0);
-                        ff_eos = SVAL(p,2);
-                }
-                debuglocal(4,"list_files %d %d %d %d\n", ff_searchcount, ff_eos, "(ff_lastname)", First);
-
-                if (ff_searchcount == 0) {
-                        SAFE_FREE(rdata);
-                        SAFE_FREE(rparam);
-                        break;
-                }
-
-                /* point to the data bytes */
-                p = rdata;
-                rdata_end = rdata + data_len;
-
-                memset(&finfo, 0, sizeof(finfo));
-                finfo.easize = -1;
-                /* we might need the lastname for continuations */
-                for (p2=p,i=0;i<ff_searchcount  && p2 < rdata_end;i++) {
-                        if ((info_level == SMB_FIND_FILE_BOTH_DIRECTORY_INFO) && 
-                                        (i == ff_searchcount-1)) {
-                                /* Last entry - fixup the last offset length. */
-                                SIVAL(p2,0,PTR_DIFF((rdata + data_len),p2));
-                        }
-                        p2 += _os2_interpret_long_filename(frame, cli, info_level, p2, rdata_end, &finfo,
-                                                        &resume_key, &last_name_raw);
-
-                        if (!finfo.fname) {
-                                debuglocal(0,"Error: unable to parse name from info level %d\n",
-                                        info_level);
-                                ff_eos = 1;
-                                break;
-                        }
-
-                        if (!First && *mask && strcsequal(finfo.fname, mask)) {
-                                debuglocal(0,"Error: Looping in FIND_NEXT as name %s has already been seen?\n",
-                                        finfo.fname);
-                                ff_eos = 1;
-                                break;
-                        }
-                }
-
-                SAFE_FREE(mask);
-                if (ff_searchcount > 0 && ff_eos == 0 && finfo.fname) {
-                        mask = SMB_STRDUP(finfo.fname);
-                } else {
-                        mask = SMB_STRDUP("");
-                }
-                if (!mask) {
-                        SAFE_FREE(rdata);
-                        SAFE_FREE(rparam);
-                        break;
-                }
-
-                /* grab the data for later use */
-                /* and add them to the dirlist pool */
-                dirlist = (char *)SMB_REALLOC(dirlist,dirlist_len + data_len);
-
-                if (!dirlist) {
-                        debuglocal(0,"cli_list_new: Failed to expand dirlist\n");
-                        SAFE_FREE(rdata);
-                        SAFE_FREE(rparam);
-                        break;
-                }
-
-                memcpy(dirlist+dirlist_len,p,data_len);
-                dirlist_len += data_len;
-
-                total_received += ff_searchcount;
-
-                SAFE_FREE(rdata);
-                SAFE_FREE(rparam);
-
-                debuglocal(3,"received %d entries (eos=%d)\n",
-                         ff_searchcount,ff_eos);
-
-                if (ff_searchcount > 0)
-                        loop_count = 0;
-
-                First = False;
-        }
-
-        /* see if the server disconnected or the connection otherwise failed */
-        if (cli_is_error(cli)) {
-                total_received = -1;
-        } else {
-                void *dircachectx = dircache_write_begin(state, total_received);
-
-                /* no connection problem.  let user function add each entry */
-                rdata_end = dirlist + dirlist_len;
-                for (p=dirlist,i=0;i<total_received;i++) {
-                        p += _os2_interpret_long_filename(frame, cli, info_level, p, rdata_end,
-                                                     &finfo,NULL,NULL);
-
-                        if (!finfo.fname) {
-                                debuglocal(0,"list_new: unable to parse name from info level %d\n",
-                                        info_level);
-                                break;
-                        }
-                        fn(cli->dfs_mountpoint,&finfo, Mask, state );
-
-                        /* Also add the entry to the cache. */
-                        dircache_write_entry(dircachectx, &finfo);
-                }
-
-                dircache_write_end(dircachectx);
-
-        }
-
-        /* free up the dirlist buffer and last name raw blob */
-        SAFE_FREE(dirlist);
-        data_blob_free(&last_name_raw);
-        SAFE_FREE(mask);
+                return(num_finfo);
+        }
+
+        if (cli_has_async_calls(cli)) {
+                /*
+                 * Can't use sync call while an async call is in flight
+                 */
+                status = NT_STATUS_INVALID_PARAMETER;
+                goto fail;
+        }
+        ev = event_context_init(frame);
+        if (ev == NULL) {
+                goto fail;
+        }
+
+        info_level = (cli->capabilities & CAP_NT_SMBS)
+                ? SMB_FIND_FILE_BOTH_DIRECTORY_INFO : SMB_FIND_EA_SIZE;
+
+        debuglocal(4,"list_files level %d. mask <%s>\n", info_level, mask);
+
+        req = cli_list_send(frame, ev, cli, mask, attribute, info_level);
+        if (req == NULL) {
+                goto fail;
+        }
+        if (!tevent_req_poll(req, ev)) {
+                status = map_nt_error_from_unix(errno);
+                goto fail;
+        }
+
+        status = cli_list_recv(req, frame, &finfo, &num_finfo);
+        if (!NT_STATUS_IS_OK(status)) {
+                goto fail;
+        }
+
+        dircachectx = dircache_write_begin(state, num_finfo);
+
+        debuglocal(4,"list_files: got %d files\n", num_finfo);
+
+
+        for (i=0; i<num_finfo; i++) {
+                //as samba and this client have different finfo, we need to convert
+                memset(&wrpfinfo, 0, sizeof(wrpfinfo));
+                wrpfinfo.size = finfo[i].size;
+                wrpfinfo.attr = finfo[i].mode;
+                wrpfinfo.ctime = convert_timespec_to_time_t(finfo[i].ctime_ts);
+                wrpfinfo.mtime = convert_timespec_to_time_t(finfo[i].mtime_ts);
+                wrpfinfo.atime = convert_timespec_to_time_t(finfo[i].atime_ts);
+                wrpfinfo.easize = finfo[i].easize;
+                strncpy(wrpfinfo.fname, finfo[i].name, sizeof(wrpfinfo.fname) -1);
+
+                fn(cli->dfs_mountpoint, &wrpfinfo, mask, state);
+                // Also add the entry to the cache.
+                dircache_write_entry(dircachectx, &wrpfinfo);
+        }
+
+        dircache_write_end(dircachectx);
+ fail:
         TALLOC_FREE(frame);
-        return(total_received);
-}
-
+        return num_finfo;
+}
 
 /***************************************************** 
@@ -1640 +979 @@
         else 
         {
-#if 0
-                if (strcmp(path,"\\") == 0) {
-                        smbwrp_special_add(".", state);
-                        smbwrp_special_add("..", state);
-                }
-#endif
-#if 0
-                if (cli_list(cli, state->mask, aHIDDEN|aSYSTEM|aDIR, 
-                             smbwrp_dir_add_old, state) < 0) 
-#else
                 if (list_files(cli, state->mask, aHIDDEN|aSYSTEM|aDIR, 
                              smbwrp_dir_add, state) < 0) 
-#endif
                 {                                                                             
                         return os2cli_errno(cli);
@@ -1769 +1097 @@
 #pragma pack()
 
-static int unilistea(cli_state * cli, char *fname, smbwrp_file *file, void * buffer, unsigned long size)
+static int unilistea(cli_state * cli, char *fname, void * buffer, unsigned long size)
 {
         int fnum, i;
@@ -1784 +1112 @@
         pfealist->cbList = 0;
 
-        if (file)
-        {
-                if (!cli_get_ea_list_fnum(cli, file->fd, mem_ctx, &num_eas, &ea_list)) 
-                {
-                        debuglocal(4,"ea_get_fnum list failed - %s\n", cli_errstr(cli));
-                        talloc_destroy(mem_ctx);
-                        return os2cli_errno(cli);
-                }
-        }
-        else
-        {
-                if (!cli_get_ea_list_path(cli, fname, mem_ctx, &num_eas, &ea_list)) 
-                {
-                        debuglocal(4,"ea_get_file list failed - %s\n", cli_errstr(cli));
-                        talloc_destroy(mem_ctx);
-                        return os2cli_errno(cli);
-                }
+        if (!cli_get_ea_list_path(cli, fname, mem_ctx, &num_eas, &ea_list)) 
+        {
+                debuglocal(4,"ea_get_file list failed - %s\n", cli_errstr(cli));
+                talloc_destroy(mem_ctx);
+                return os2cli_errno(cli);
         }
 
@@ -1847 +1163 @@
 
         debuglocal(4,"EALIst for <%s>\n", fname);
-        return unilistea(cli, fname, NULL, buffer, size);
+        return unilistea(cli, fname, buffer, size);
 }
 
@@ -1860 +1176 @@
         }
 
-        debuglocal(4,"FEALIst for <%s>/%d\n", file->fname, file->fd);
-        return unilistea(cli, NULL, file, buffer, size);
+        debuglocal(4,"FEALIst for <%s>\n", file->fname);
+        return unilistea(cli, file->fname, buffer, size);
 }