Changeset 817

Timestamp:

Sep 27, 2013, 1:55:10 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.1: timestamp work and some backport from 2.2 client

Location:

branches/client-2.1/src

Files:

• BuildAll.cmd (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)
• debug.c (modified) (1 diff)
• ndpsmb.c (modified) (36 diffs)
• nversion.tpl (modified) (1 diff)
• resources/ndpsmb.tpl (modified) (1 diff)
• smbwrp.c (modified) (11 diffs)

branches/client-2.1/src/BuildAll.cmd

@@ -5 +5 @@
 kmk BUILD_TYPE=release
 
+kmk BUILD_TYPE=debug install
+kmk BUILD_TYPE=release install
+
 kmk BUILD_TYPE=debug packing
 kmk BUILD_TYPE=release packing

branches/client-2.1/src/Makefile.kmk

@@ -92 +92 @@
                 | $(SED) "s;_WPIVERSION_;$(subst .,\\\,$(VERSION));g" \
                 | $(SED) "s;_BUILD_;$(BUILD);g" \
+                | $(SED) "s;_VENDOR_;$(VENDOR);g" \
                 > rc/rc.rc
 
@@ -132 +133 @@
                 | $(SED) "s;_WPIVERSION_;$(subst .,\\\,$(VERSION));g" \
                 | $(SED) "s;_BUILD_;$(BUILD);g" \
+                | $(SED) "s;_VENDOR_;$(VENDOR);g" \
                 > nversion.h
 

branches/client-2.1/src/debug.c

@@ -138 +138 @@
                 {
                    fprintf(f, "Samba client %s build %s based on %s\n", VERSION, BUILD, smbwrp_getVersion());
+                   fprintf(f, "This build is maintained by %s\n", VENDOR);
                    firstLogLine = FALSE;
                 }

branches/client-2.1/src/ndpsmb.c

@@ -104 +104 @@
         {ND_PROP_STRING, 0, "USER", "guest"},
         {ND_PROP_STRING, 0, "PASSWORD", ""},
-                {ND_PROP_STRING, 0, "SPASSWORD",  ""},
+        {ND_PROP_STRING, 0, "SPASSWORD",  ""},
         {ND_PROP_STRING, 0, "MASTER", "WORKGROUP"},
         {ND_PROP_ULONG, 0, "MASTERTYPE", "1"},
-                {ND_PROP_ULONG, 0, "CTO", "10"},
-                {ND_PROP_ULONG, 0, "CLD", "32"},
+        {ND_PROP_ULONG, 0, "CTO", "10"},
+        {ND_PROP_ULONG, 0, "CLD", "32"},
         {ND_PROP_ULONG, 0, "EASUPPORT", "1"},
         {ND_PROP_STRING, 0, NULL, NULL}
@@ -126 +126 @@
 /* A mutex to serialize plugin calls because libsmb may not be thread safe. */
 static NDMUTEX mutex;
-                
+
 static int lockInit (void)
 {
         return ph->fsphCreateMutex (&mutex);
 }
-                
+
 static void lockClose (void)
 {
         ph->fsphCloseMutex (mutex);
 }
-                
+
 static int lockRequest (void)
 {
@@ -150 +150 @@
 
 #define ENTER() do {                    \
-        int rcLock = lockRequest(); \
-        if (rcLock != NO_ERROR)  \
-                return rcLock;            \
+        int rcLock = lockRequest();     \
+        if (rcLock != NO_ERROR)         \
+                return rcLock;          \
 } while (0)
 
-#define LEAVE() do { \
+#define LEAVE() do {    \
         lockRelease();  \
 } while (0)
@@ -181 +181 @@
                 ifL = 1;
         }
-                lockInit();
-                debugInit();
+        lockInit();
+        debugInit();
         debuglocal(9,"Working with %s bit fileio NDFS\n", ifL ? "64" : "32");
         return NO_ERROR;
@@ -190 +190 @@
 int APIENTRY NdpPluginFree (void)
 {
-                debugDelete();
-                lockClose();
+        debugDelete();
+        lockClose();
         return NO_ERROR;
 }
@@ -218 +218 @@
         stat->attrFile = (finfo->attr & 0x37);
 
-                fsphUnixTimeToDosDate(finfo->mtime, &stat->fdateLastWrite, &stat->ftimeLastWrite);
-                fsphUnixTimeToDosDate(finfo->ctime, &stat->fdateCreation, &stat->ftimeCreation);
-                fsphUnixTimeToDosDate(finfo->atime, &stat->fdateLastAccess, &stat->ftimeLastAccess);
+        fsphUnixTimeToDosDate(finfo->mtime, &stat->fdateLastWrite, &stat->ftimeLastWrite);
+        fsphUnixTimeToDosDate(finfo->ctime, &stat->fdateCreation, &stat->ftimeCreation);
+        fsphUnixTimeToDosDate(finfo->atime, &stat->fdateLastAccess, &stat->ftimeLastAccess);
 }
 
@@ -248 +248 @@
         stat.attrFile = (finfo->attr & 0x37);
 
-                fsphUnixTimeToDosDate(finfo->mtime, &stat.fdateLastWrite, &stat.ftimeLastWrite);
-                fsphUnixTimeToDosDate(finfo->ctime, &stat.fdateCreation, &stat.ftimeCreation);
-                fsphUnixTimeToDosDate(finfo->atime, &stat.fdateLastAccess, &stat.ftimeLastAccess);
+        fsphUnixTimeToDosDate(finfo->mtime, &stat.fdateLastWrite, &stat.ftimeLastWrite);
+        fsphUnixTimeToDosDate(finfo->ctime, &stat.fdateCreation, &stat.ftimeCreation);
+        fsphUnixTimeToDosDate(finfo->atime, &stat.fdateLastAccess, &stat.ftimeLastAccess);
         debug_printf( "fname %s\n", finfo->fname);
         debug_printf( "mtime %d %s", finfo->mtime, ctime( (time_t*)&finfo->mtime));
@@ -263 +263 @@
         if ('0' <= c && c <= '9')
         {
-                 return c - '0';
-        }
-        
+                return c - '0';
+        }
+
         if ('A' <= c && c <= 'F')
         {
-                 return c - 'A' + 0xA;
-        }
-        
+                return c - 'A' + 0xA;
+        }
+
         if ('a' <= c && c <= 'f')
         {
-                 return c - 'a' + 0xA;
-        }
-        
+                return c - 'a' + 0xA;
+        }
+
         return 0;
 }
@@ -282 +282 @@
 {
         b &= 0xF;
-        
+
         if (b <= 9)
         {
                 return b + '0';
         }
-        
+
         return 'A' + (b - 0xA);
 }
@@ -296 +296 @@
         const char *s = pszCrypt;
         char *d = pszPlain;
-        
+
         while (*s)
         {
                 *d++ = (char)((fromhex (*s++) << 4) + fromhex (*s++));
         }
-        
+
         *d++ = 0;
 }
@@ -310 +310 @@
         const char *s = pszPlain;
         char *d = pszCrypt;
-        
+
         while (*s)
         {
@@ -317 +317 @@
                 s++;
         }
-        
+
         *d++ = 0;
 }
@@ -338 +338 @@
         pRes->krb5support = 0;
 #endif
-                pRes->pdc = NULL;
+        pRes->pdc = NULL;
 
         t = 0, q = NULL;
@@ -380 +380 @@
 
         t = 0, q = NULL;
-                rc = ph->fsphQueryStringProperty (properties, "SPASSWORD", &q, &t);
-                if (   rc == NO_ERROR
-                        && *q != '\0'
-                        && defaultPassword)
-                {
-                        char p[1024];
-                        p[0] = 0;
-                
-                        decryptPassword (q, p);
-                
-                        if (*p)
-                        {
-                strncpy(pRes->srv.password, p, sizeof(pRes->srv.password) - 1);
-                
-                                /* clear the plain password */
-                                ph->fsphSetProperty (properties, "PASSWORD", "");
-                        }
-                }
-                else
-                {
-                        char c[1024];
-                        encryptPassword (pRes->srv.password, c);
-                
-                        ph->fsphSetProperty (properties, "SPASSWORD", c);
-                
-                        // clear the plain password
+        rc = ph->fsphQueryStringProperty (properties, "SPASSWORD", &q, &t);
+        if (   rc == NO_ERROR && *q != '\0' && defaultPassword)
+        {
+                char p[1024];
+                p[0] = 0;
+
+                decryptPassword (q, p);
+
+                if (*p)
+                {
+                        strncpy(pRes->srv.password, p, sizeof(pRes->srv.password) - 1);
+
+                        /* clear the plain password */
                         ph->fsphSetProperty (properties, "PASSWORD", "");
                 }
+        }
+        else
+        {
+                char c[1024];
+                encryptPassword (pRes->srv.password, c);
+
+                ph->fsphSetProperty (properties, "SPASSWORD", c);
+
+                // clear the plain password
+                ph->fsphSetProperty (properties, "PASSWORD", "");
+        }
 
         t = 0, q = NULL;
@@ -473 +471 @@
 
         /*
-                 * Create a directory cache with expiration time and cache listings
-                 * the above values come from the gui. default: timeout 10; listings: 32
-                 */
+         * Create a directory cache with expiration time and cache listings
+         * the above values come from the gui. default: timeout 10; listings: 32
+         */
         dircache_create(&pRes->pdc, pRes->cachetimeout, pRes->cachedepth);
 
@@ -580 +578 @@
                 if (newlevel)
                 {
-                                // reconnect to server here, first test new connection
+                        // reconnect to server here, first test new connection
                         cli_state* tmp_cli = NULL;
                         rc = smbwrp_connect( &tmpRes, &tmp_cli);
@@ -918 +916 @@
 /* 
  * NdpQueryPathInfo is the most important  function :) netdrive always calls
- * the function before every operation to find out the path status: does it exist, is it a file, does a
- *  parent directory exist, etc.
+ * the function before every operation to find out the path status:
+ * does it exist, is it a file, does a parent directory exist, etc.
  * Plugin must return one of the following error codes:
- * NO_ERROR - path exists and the path information have been successfully retrieved.
+ * NO_ERROR - path exists and the path information have been successfully
+ *      retrieved.
  * ERROR_FILE_NOT_FOUND - all but the last component of the path exist and the 
- *      path without the last component is a directory. dir1_ok\dir2_ok\does_not_exist. 
- *      the wildcard can not exist, so the plugin returns FILE_NOT_FOUND, if the parent 
- *      directory exist.
+ *      path without the last component is a directory. dir1_ok\dir2_ok\does_not_exist. 
+ *      the wildcard can not exist, so the plugin returns FILE_NOT_FOUND, if the parent 
+ *      directory exist.
  * ERROR_PATH_NOT_FOUND - any of not last path components does not exist, or all
- *      but the last component exist and is a file: \dir_ok\dir2_ok\file_ok\non_existing.
+ *      but the last component exist and is a file: \dir_ok\dir2_ok\file_ok\non_existing.
  * ERROR_REM_NOT_LIST - resource is temporarily unavailable for some reasons.
  * Any other error codes means an internal plugin error, not related to the status 
@@ -1002 +1001 @@
                                         rcCon = smbwrp_connect( pRes, &pConn->cli);
                                         if (rcCon != NO_ERROR)
-                                        debuglocal(9,"NdpQueryPathInfo smbwrp_connect rc = %d\n", rcCon);
+                                                debuglocal(9,"NdpQueryPathInfo smbwrp_connect rc = %d\n", rcCon);
 
                                         // try file list again if reconnecting worked
                                         if (rcCon == NO_ERROR)
-                                        rc = smbwrp_getattr( &pRes->srv, pConn->cli, &finfo);
+                                                rc = smbwrp_getattr( &pRes->srv, pConn->cli, &finfo);
                                 }
                                 debuglocal(9,"NdpQueryPathInfo smbwrp_getattr, rc = %d\n", rc);
@@ -1037 +1036 @@
                                         *p = 0;
                                         rc = smbwrp_getattr( &pRes->srv, pConn->cli, &finfo);
-                                                                                debuglocal(9,"NdpQueryPathInfo upper path in <%s>, rc = %d\n",  finfo.fname, rc);
+                                        debuglocal(9,"NdpQueryPathInfo upper path in <%s>, rc = %d\n",  finfo.fname, rc);
                                         if (rc == NO_ERROR)
                                         {       
                                                 rc = (finfo.attr & FILE_DIRECTORY) !=0 ?
-                                                                                                ERROR_FILE_NOT_FOUND:
-                                                                                                ERROR_PATH_NOT_FOUND;
+                                                ERROR_FILE_NOT_FOUND:ERROR_PATH_NOT_FOUND;
                                         }
-                                                                                else if (rc != ERROR_REM_NOT_LIST)
-                                                                                {
-                                                                                          rc = ERROR_PATH_NOT_FOUND;
+                                        else if (rc != ERROR_REM_NOT_LIST)
+                                        {
+                                                rc = ERROR_PATH_NOT_FOUND;
                                         }
                                 }
@@ -1133 +1131 @@
                 }
                 debuglocal(9,"NdpFindStart: dir [%s], dir_mask [%s], mask [%s], szPath [%s]\n",
-                                                   state.dir, state.dir_mask, state.mask, state.fullpath);
+                        state.dir, state.dir_mask, state.mask, state.fullpath);
                 rc = smbwrp_filelist( &pRes->srv, pConn->cli, &state);
                 // we need to handle reconnection also here, because NdpQueryPathInfo 
@@ -1190 +1188 @@
         debug_printf("NdpSetPathInfo in [%p]\n", pConn);
 
-                // delete the dir cache
+        // delete the dir cache
         dircache_invalidate(szPathName, pRes->pdc, 1);
 
@@ -1306 +1304 @@
         debuglocal(9,"NdpEAQuery in [%p] <%s> %08x %d\n", pConn, path, pGEAList, pGEAList ? pGEAList->cbList : 0);
 
-                char *pchBuffer = (char *)malloc(cbBuffer);
-                if (!pchBuffer)
-                {
-                                LEAVE();
-                                return ERROR_NOT_ENOUGH_MEMORY;
-                }
+        char *pchBuffer = (char *)malloc(cbBuffer);
+        if (!pchBuffer)
+        {
+                LEAVE();
+                return ERROR_NOT_ENOUGH_MEMORY;
+        }
 
         do {
@@ -1342 +1340 @@
                 }
         } while (0);
-                free(pchBuffer);
+        free(pchBuffer);
         debuglocal(9,"NdpEAQuery <%s> %d %d %d\n", pfi->pszName, rc, pFEASrc->cbList, pFEAList->cbList);
         LEAVE();
@@ -1423 +1421 @@
                 return ERROR_EAS_NOT_SUPPORTED;
         }
-                
-                debuglocal(9, "remove me NdpEASize before fsphGetFileInfoData\n");
+
         rc = ph->fsphGetFileInfoData(pfi, &fdata, 0);
         if (rc || !fdata.ulSize || !fdata.pData)
@@ -1434 +1431 @@
         ENTER();
 
-                debuglocal(9, "remove me NdpEASize before finfo =\n");
         finfo = (smbwrp_fileinfo *)fdata.pData;
-                debuglocal(9, "remove me NdpEASize after finfo=\n");
         easize = finfo->easize;
         finfo->easize = -1;
@@ -1450 +1445 @@
         debuglocal(9,"NdpEASize in [%p] <%s> \n", pConn, path);
 
-                char *pchBuffer = (char *)malloc(cbBuffer);
-                if (!pchBuffer)
-                {
-                                LEAVE();
-                                return ERROR_NOT_ENOUGH_MEMORY;
-                }
+        char *pchBuffer = (char *)malloc(cbBuffer);
+        if (!pchBuffer)
+        {
+                LEAVE();
+                return ERROR_NOT_ENOUGH_MEMORY;
+        }
 
         do {
@@ -1482 +1477 @@
                 *pulEASize = pfealist->cbList;
         } while (0);
-                free(pchBuffer);
+        free(pchBuffer);
         debuglocal(9,"NdpEASize <%s> %d %d\n", pfi->pszName, *pulEASize, rc);
         LEAVE();
@@ -1793 +1788 @@
 {
         if (function == ND_PL_INIT_THREAD)
-           {
-                  smbwrp_initthread();
-                  debuglocal(9, "NdpIOCTL init thread\n");
-                  return NO_ERROR;
-           }
+        {
+                smbwrp_initthread();
+                debuglocal(9, "NdpIOCTL init thread\n");
+                return NO_ERROR;
+        }
 
         debuglocal(9,"NdpIOCTL <%s> %d\n", path, function);
@@ -1803 +1798 @@
         if (in && insize > 4096)
         {
-        char out[4096];
-        sprintf (out, "SAMBA IOCTL function = %d, parms [%s] insize = %d, *poutlen = %d", function, in, insize, *poutlen);
-        *poutlen = strlen(out);
-        strcpy (in, out);
-        return NO_ERROR;
+                char out[4096];
+                sprintf (out, "SAMBA IOCTL function = %d, parms [%s] insize = %d, *poutlen = %d", function, in, insize, *poutlen);
+                *poutlen = strlen(out);
+                strcpy (in, out);
+                return NO_ERROR;
         }
 
@@ -1863 +1858 @@
         debuglocal(9,"NdpFileEAQuery in [%p] <%s>/%d pGEAList=%08x\n", pConn, pConn->file.fname, pConn->file.fd, pGEAList);
 
-                char *pchBuffer = (char *)malloc(cbBuffer);
-                if (!pchBuffer)
-                                return ERROR_NOT_ENOUGH_MEMORY;
+        char *pchBuffer = (char *)malloc(cbBuffer);
+        if (!pchBuffer)
+                return ERROR_NOT_ENOUGH_MEMORY;
 
         ENTER();
@@ -1903 +1898 @@
                 }
         } while (0);
-                free(pchBuffer);
+        free(pchBuffer);
         debuglocal(9,"NdpFileEAQuery out <%s>/%d pFEASrc->cbList=%d pFEAList->cbList=%d rc=%d\n", pConn->file.fname, pConn->file.fd, pFEASrc->cbList, pFEAList->cbList, rc);
         LEAVE();
@@ -1978 +1973 @@
         debuglocal(9,"NdpFileEASize in [%p] <%s>/%d \n", pConn, pConn->file.fname, pConn->file.fd);
 
-                char *pchBuffer = (char *)malloc(cbBuffer);
-                if (!pchBuffer)
-                                return ERROR_NOT_ENOUGH_MEMORY;
+        char *pchBuffer = (char *)malloc(cbBuffer);
+        if (!pchBuffer)
+                return ERROR_NOT_ENOUGH_MEMORY;
 
         ENTER();
@@ -2014 +2009 @@
                 *pulEASize = pFEAList->cbList;
         } while (0);
-                free(pchBuffer);
+        free(pchBuffer);
         debuglocal(9,"NdpFileEASize %d %d\n", *pulEASize, rc);
         LEAVE();
@@ -2031 +2026 @@
         debug_printf("NdpFileSetInfo in [%p]\n", pConn);
 
-                // delete the dir cache
+        // delete the dir cache
         dircache_invalidate(pConn->file.fullname, pRes->pdc, 1);
 
@@ -2182 +2177 @@
                 while (ulReadCompleted < ulRead)
                 {
-                                ULONG ulActual;
+                        ULONG ulActual;
                         ULONG ulToRead = ulRead - ulReadCompleted;
                         debuglocal(9,"NdpFileRead completed %d, to read %d\n", ulReadCompleted, ulToRead);
@@ -2229 +2224 @@
         debuglocal(9,"NdpFileWrite in [%p]\n", pConn);
 
-                /* delete the dir cache
-                this was moved from NdpFileClose() becasue if there are a lot files in the tree all are reread
-                the problem when moved to here is, that last accessed time is not refreshed
-                if this is needed, a new function needs to be done to update only one file in the cache */
+        /* delete the dir cache
+        this was moved from NdpFileClose() becasue if there are a lot files in the tree all are reread
+        the problem when moved to here is, that last accessed time is not refreshed
+        if this is needed, a new function needs to be done to update only one file in the cache */
         dircache_invalidate(pConn->file.fullname, pRes->pdc, 1);
 

branches/client-2.1/src/nversion.tpl

@@ -3 +3 @@
 #define __nversion__H
 
-#define NDPSMB_VERSION  _VERSION_
-#define NDPSMB_BUILD    _BUILD_
-#define NDPSMB_INSTALL  _WPIVERSION_
-#define VERSION        "_VERSION_"
-#define BUILD          "_BUILD_"
-#define OS              eCS (OS/2)
-#define ND              NetDrive
+#define NDPSMB_VERSION  _VERSION_
+#define NDPSMB_BUILD    _BUILD_
+#define NDPSMB_INSTALL  _WPIVERSION_
+#define VERSION         "_VERSION_"
+#define BUILD           "_BUILD_"
+#define OS              eCS (OS/2)
+#define ND              NetDrive
+#define VENDOR          "_VENDOR_"
 
 #endif // __nversion__H

branches/client-2.1/src/resources/ndpsmb.tpl

@@ -113 +113 @@
     =("chkndenv")
     =("ChkREQ LIBC065.DLL Package:netlabs.org\kLIBC\LIBC 0.6 Runtime\0\6\5")
-    =("ChkREQ GCC442.DLL Package:netlabs.org\GCC4\Core\1\2\0")
+    =("ChkREQ GCC446.DLL Package:netlabs.org\GCC4\Core\1\2\0")
     =("ChkREQ STDCPP.DLL Package:netlabs.org\GCC4\Core\1\2\1")
     TITLE="Samba Client Plugin for Netdrive and EVFS"

branches/client-2.1/src/smbwrp.c

@@ -39 +39 @@
 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;
+                void (*fn)(const char *name,
+                uint32 type,
+                const char *comment,
+                void *state),
+                void *state)
+{
+        int i;
         NTSTATUS status;
-        WERROR werr;
+        WERROR werr;
         uint32_t resume_handle = 0;
-        uint32_t total_entries = 0;
-        struct srvsvc_NetShareInfoCtr info_ctr;
-        struct srvsvc_NetShareCtr1 ctr1;
+        uint32_t total_entries = 0;
+        struct srvsvc_NetShareInfoCtr info_ctr;
+        struct srvsvc_NetShareCtr1 ctr1;
         fstring name = "";
-        fstring comment = "";
-        void *mem_ctx;
+        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 */
+        /* 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;
+        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? */
+                                                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. */
+                /*  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);
-        }
+        }
+
+        /* 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;
+        /* 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;
 }
 
@@ -125 +125 @@
 void smbwrp_Logging()
 {
-        char slogfile[_MAX_PATH +1] = {0};
-        char slogfilename[] = "log.smbc";
-        char *env = getenv("LOGFILES");
-                if (env != NULL)
-                {
-                   strncpy(slogfile, env, sizeof(slogfile) -1);
-                   strncat(slogfile, "\\", sizeof(slogfile) - strlen(slogfile) -1);
-                   strncat(slogfile, slogfilename, sizeof(slogfile) - strlen(slogfile) -1);
-                }
-                else
-                {
-                   strncpy(slogfile, slogfilename, sizeof(slogfile) -1);
-                }
-
-                // init samba for debug messages
-                setup_logging(slogfile, false);
-                lp_set_logfile(slogfile);
-                debug_parse_levels("10");
+        char slogfile[_MAX_PATH +1] = {0};
+        char slogfilename[] = "log.smbc";
+        char *env = getenv("LOGFILES");
+        if (env != NULL)
+        {
+                strncpy(slogfile, env, sizeof(slogfile) -1);
+                strncat(slogfile, "\\", sizeof(slogfile) - strlen(slogfile) -1);
+                strncat(slogfile, slogfilename, sizeof(slogfile) - strlen(slogfile) -1);
+        }
+        else
+        {
+                strncpy(slogfile, slogfilename, sizeof(slogfile) -1);
+        }
+
+        // init samba for debug messages
+        setup_logging(slogfile, false);
+        lp_set_logfile(slogfile);
+        debug_parse_levels("10");
 
 }
 const char * smbwrp_getVersion()
 {
-        return SAMBA_VERSION_STRING;
+        return SAMBA_VERSION_STRING;
 }
 
@@ -169 +169 @@
         initialised = 1;
 
-        lp_set_in_client(true); /* Make sure that we tell lp_load we are client */
+        lp_set_in_client(true); /* Make sure that we tell lp_load we are client */
 
         load_case_tables();
@@ -184 +184 @@
         }
 
-        if (writeLog())
-        {
-                smbwrp_Logging();
-        }
+        if (writeLog())
+        {
+                smbwrp_Logging();
+        }
 
 /*
@@ -200 +200 @@
 void smbwrp_initthread(void)
 {
-        /*
-         * Block SIGPIPE (from lib/util_sock.c: write())
-         * It is not needed and should not stop execution
-         */
-        BlockSignals(True, SIGPIPE);
+        /*
+        Block SIGPIPE (from lib/util_sock.c: write())
+        It is not needed and should not stop execution
+        */
+        BlockSignals(True, SIGPIPE);
 }
 
@@ -313 +313 @@
         uint16 setup = TRANSACT2_QPATHINFO;
         char *param;
-        size_t nlen = 2*(strlen(fname)+1);
+        size_t nlen = 2*(strlen(fname)+1);
         char *rparam=NULL, *rdata=NULL;
         char *p;
-        
-        param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
-        if (!param) {
+
+        param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
+        if (!param) {
                 return false;
         }
@@ -331 +331 @@
 
         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 */
-                           )) {
+                        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);
+        SAFE_FREE(param);
         if (!cli_receive_trans(cli, SMBtrans2,
-                               &rparam, &param_len,
-                               &rdata, &data_len)) {
+                        &rparam, &param_len,
+                        &rdata, &data_len)) {
                 return False;
         }
@@ -402 +402 @@
 
         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 */
-                           )) {
+                        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)) {
+                        &rparam, &param_len,
+                        &rdata, &data_len)) {
                 return False;
         }
@@ -503 +503 @@
 
  again:
-        zero_sockaddr(&ss);
+        zero_sockaddr(&ss);
 
         /* have to open a new connection */
@@ -695 +695 @@
                 debuglocal(4,"cli_close new mtime %lu\n", file->mtime);
         }
-
-        if (file->updatetime == 2 && !cli_setattrE(cli, file->fd, file->ctime, 0, file->mtime))
-        {
-                debuglocal(4,"Set attrE on close failed %d\n", os2cli_errno(cli));
-        }
         
         if (!cli_close(cli, file->fd))
@@ -706 +701 @@
         }
 
-        if (!rc && (file->openattr || file->mtime))
-        {
-                debuglocal(4,"Set attr on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->mtime);
-                if (!cli_setatr(cli, file->fname, file->openattr, file->mtime)) 
-                {
-                        debuglocal(4,"Set attr on close failed %d\n", os2cli_errno(cli));
+        if (!rc && (file->openattr || file->mtime || file->ctime))
+        {
+                debuglocal(4,"Set pathinfo on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->ctime);
+                if (!cli_setpathinfo(cli, file->fname, file->ctime, 0, file->mtime, 0, file->openattr)) 
+                {
+                        debuglocal(4,"Set pathinfo on close failed %d\n", os2cli_errno(cli));
                         //rc = os2cli_errno(cli);
                 }
-                
         }
 
         file->openattr = 0;
         file->mtime = 0;
-        file->updatetime = 0;           
+        file->ctime = 0;
+        file->updatetime = 0;
         file->fd = -1;
         file->offset = 0;