Changeset 818

Timestamp:

Sep 27, 2013, 1:57:24 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.1: timestamp work

Location:

trunk/client/src

Files:

• help/readme_fr.txt (modified) (1 diff)
• ndpsmb.c (modified) (37 diffs)
• nversion.tpl (modified) (1 diff)
• smbwrp.c (modified) (11 diffs)
• smbwrp.h (modified) (1 diff)

trunk/client/src/help/readme_fr.txt

@@ -251 +251 @@
 
 Traduction fran‡aise : Guillaume Gay <guillaume.gay@bigfoot.com>
-Version : 2010-01-11
+Version : 2012-01-21

trunk/client/src/ndpsmb.c

@@ -42 +42 @@
 void fsphUnixTimeToDosDate( time_t time, FDATE* fdate, FTIME *ftime)
 {
-    struct tm* gmt = localtime( &time);
+        struct tm* gmt = localtime( &time);
 #if 0 // as localtime() already does dst we don't need to add something
-    if (gmt->tm_isdst>0) {
+        if (gmt->tm_isdst>0) {
         debug_printf( "daylight saving in effect %d, timezone %d\n",gmt->tm_isdst, timezone); 
         time -= 3600;
         gmt = localtime( &time);
-    }
+        }
 #endif
-    fdate->day  = gmt->tm_mday;
-    fdate->month  = gmt->tm_mon+1;
-    fdate->year = gmt->tm_year + 1900 - 1980;
-    ftime->twosecs = gmt->tm_sec/2;
-    ftime->minutes = gmt->tm_min;
-    ftime->hours = gmt->tm_hour;
+        fdate->day  = gmt->tm_mday;
+        fdate->month  = gmt->tm_mon+1;
+        fdate->year = gmt->tm_year + 1900 - 1980;
+        ftime->twosecs = gmt->tm_sec/2;
+        ftime->minutes = gmt->tm_min;
+        ftime->hours = gmt->tm_hour;
 }
 
 void fsphDosDateToUnixTime( FDATE fdate, FTIME ftime, ULONG* time)
 {
-    struct tm gmtime = { 0 };
-
-    debug_printf( "fsphDosDateToUnixTime time %02d:%02d\n", ftime.hours, ftime.minutes);
-    gmtime.tm_mday = fdate.day;
-    gmtime.tm_mon = fdate.month-1;
-    gmtime.tm_year = fdate.year + 1980 - 1900;
-    gmtime.tm_sec = ftime.twosecs*2;
-    gmtime.tm_min = ftime.minutes;
-    gmtime.tm_hour = ftime.hours;
-    gmtime.tm_isdst = -1; // force libc to check dst saving
-
-    *time = mktime( &gmtime);
-    debug_printf( "fsphDosDateToUnixTime time1 %d %s", *time, ctime( (time_t*)time));
+        struct tm gmtime = { 0 };
+
+        debug_printf( "fsphDosDateToUnixTime time %02d:%02d:%02d\n", ftime.hours, ftime.minutes, ftime.twosecs*2);
+        gmtime.tm_mday = fdate.day;
+        gmtime.tm_mon = fdate.month-1;
+        gmtime.tm_year = fdate.year + 1980 - 1900;
+        gmtime.tm_sec = ftime.twosecs*2;
+        gmtime.tm_min = ftime.minutes;
+        gmtime.tm_hour = ftime.hours;
+        gmtime.tm_isdst = -1; // force libc to check dst saving
+
+        *time = mktime( &gmtime);
+        debug_printf( "fsphDosDateToUnixTime time1 %d %s", *time, ctime( (time_t*)time));
 #if 0 // as mktime() already does dst we don't need to add something
-    struct tm* gmt;
-    gmt = localtime( (time_t*) time);
-    if (gmt->tm_isdst>0) {
+        struct tm* gmt;
+        gmt = localtime( (time_t*) time);
+        if (gmt->tm_isdst>0) {
         debug_printf( "fsphDosDateToUnixTime daylight saving in effect %d, timezone %d\n",gmt->tm_isdst, timezone); 
         *time += 3600;
-    }
+        }
+        debug_printf( "fsphDosDateToUnixTime time2 %d %s", *time, ctime( (time_t*)time));
 #endif
-    debug_printf( "fsphDosDateToUnixTime time2 %d %s", *time, ctime( (time_t*)time));
 }
         
@@ -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);
-}
-        
+        return ph->fsphCreateMutex (&mutex);
+}
+
 static void lockClose (void)
 {
-    ph->fsphCloseMutex (mutex);
-}
-        
+        ph->fsphCloseMutex (mutex);
+}
+
 static int lockRequest (void)
 {
-    return ph->fsphRequestMutex (mutex, SEM_INDEFINITE_WAIT);
+        return ph->fsphRequestMutex (mutex, SEM_INDEFINITE_WAIT);
 }
 
 static void lockRelease (void)
 {
-    ph->fsphReleaseMutex (mutex);
+        ph->fsphReleaseMutex (mutex);
 }
 
 #if LIBSMB_THREAD_SAFE==0
 
-#define ENTER() do {            \
-    int rcLock = lockRequest(); \
-    if (rcLock != NO_ERROR)     \
-        return rcLock;          \
+#define ENTER() do {                    \
+        int rcLock = lockRequest();     \
+        if (rcLock != NO_ERROR)         \
+                return rcLock;          \
 } while (0)
 
-#define LEAVE() do { \
-    lockRelease();    \
+#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));
@@ -261 +261 @@
 static unsigned char fromhex (char c)
 {
-    if ('0' <= c && c <= '9')
-    {
-         return c - '0';
-    }
-    
-    if ('A' <= c && c <= 'F')
-    {
-         return c - 'A' + 0xA;
-    }
-    
-    if ('a' <= c && c <= 'f')
-    {
-         return c - 'a' + 0xA;
-    }
-    
-    return 0;
+        if ('0' <= c && c <= '9')
+        {
+                return c - '0';
+        }
+
+        if ('A' <= c && c <= 'F')
+        {
+                return c - 'A' + 0xA;
+        }
+
+        if ('a' <= c && c <= 'f')
+        {
+                return c - 'a' + 0xA;
+        }
+
+        return 0;
 }
 
 static char tohex (unsigned char b)
 {
-    b &= 0xF;
-    
-    if (b <= 9)
-    {
-        return b + '0';
-    }
-    
-    return 'A' + (b - 0xA);
+        b &= 0xF;
+
+        if (b <= 9)
+        {
+                return b + '0';
+        }
+
+        return 'A' + (b - 0xA);
 }
 
 static void decryptPassword (const char *pszCrypt, char *pszPlain)
 {
-    /* A simple "decryption", character from the hex value. */
-    const char *s = pszCrypt;
-    char *d = pszPlain;
-    
-    while (*s)
-    {
-        *d++ = (char)((fromhex (*s++) << 4) + fromhex (*s++));
-    }
-    
-    *d++ = 0;
+        /* A simple "decryption", character from the hex value. */
+        const char *s = pszCrypt;
+        char *d = pszPlain;
+
+        while (*s)
+        {
+                *d++ = (char)((fromhex (*s++) << 4) + fromhex (*s++));
+        }
+
+        *d++ = 0;
 }
 
 static void encryptPassword (const char *pszPlain, char *pszCrypt)
 {
-    /* A simple "encryption" encode each character as hex value. */
-    const char *s = pszPlain;
-    char *d = pszCrypt;
-    
-    while (*s)
-    {
-        *d++ = tohex ((*s) >> 4);
-        *d++ = tohex (*s);
-        s++;
-    }
-    
-    *d++ = 0;
+        /* A simple "encryption" encode each character as hex value. */
+        const char *s = pszPlain;
+        char *d = pszCrypt;
+
+        while (*s)
+        {
+                *d++ = tohex ((*s) >> 4);
+                *d++ = tohex (*s);
+                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
-            ph->fsphSetProperty (properties, "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);
@@ -615 +613 @@
         rc = smbwrp_connect( pRes, &cli);
 /* changed to real error codes SCS 
-    if (rc)
-        rc = (rc == 7 ? ERROR_BAD_DEV_TYPE : ERROR_ACCESS_DENIED); */
+        if (rc)
+                rc = (rc == 7 ? ERROR_BAD_DEV_TYPE : ERROR_ACCESS_DENIED); */
         switch (rc) {
         case 0:
@@ -682 +680 @@
                 // nd/ndpm do not use main thread
                 if (!rc && _gettid()!=1)
-                    rc = checkMountResource( pRes);
+                        rc = checkMountResource( pRes);
                 if (!rc)
                 {
@@ -812 +810 @@
         if (rc) 
         {
-            debuglocal(9,"NdpCreateConnection failed rc=%d\n", rc);     
-            pfsa->cSectorUnit = 1;
-            pfsa->cUnit = 123456;
-            pfsa->cUnitAvail = 123456;
-            pfsa->cbSector = 2048;
-            rc = (rc == 7 ? ERROR_BAD_DEV_TYPE : ERROR_ACCESS_DENIED);
-            LEAVE();
-            return rc;
+                debuglocal(9,"NdpCreateConnection failed rc=%d\n", rc); 
+                pfsa->cSectorUnit = 1;
+                pfsa->cUnit = 123456;
+                pfsa->cUnitAvail = 123456;
+                pfsa->cbSector = 2048;
+                rc = (rc == 7 ? ERROR_BAD_DEV_TYPE : ERROR_ACCESS_DENIED);
+                LEAVE();
+                return rc;
         }
 
@@ -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 
@@ -997 +996 @@
                                 if (rc == ERROR_REM_NOT_LIST)
                                 {
-                                    // free current cli resources
-                                    smbwrp_disconnect( pRes, pConn->cli);
-                                    // reconnect
-                                    rcCon = smbwrp_connect( pRes, &pConn->cli);
-                                    if (rcCon != NO_ERROR)
-                                    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);
+                                        // free current cli resources
+                                        smbwrp_disconnect( pRes, pConn->cli);
+                                        // reconnect
+                                        rcCon = smbwrp_connect( pRes, &pConn->cli);
+                                        if (rcCon != NO_ERROR)
+                                                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);
                                 }
                                 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;
+                                                rc = (finfo.attr & FILE_DIRECTORY) !=0 ?
+                                                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 
@@ -1139 +1137 @@
                 if (rc == ERROR_REM_NOT_LIST)
                 {
-                    // free current cli resources
-                    smbwrp_disconnect( pRes, pConn->cli);
-                    // reconnect
-                    smbwrp_connect( pRes, &pConn->cli);
-                    // try file list again next loop
-                    rc = smbwrp_filelist( &pRes->srv, pConn->cli, &state);
-                    debuglocal(9,"NdpFindStart remote connection lost, rc = %d\n", rc);
+                        // free current cli resources
+                        smbwrp_disconnect( pRes, pConn->cli);
+                        // reconnect
+                        smbwrp_connect( pRes, &pConn->cli);
+                        // try file list again next loop
+                        rc = smbwrp_filelist( &pRes->srv, pConn->cli, &state);
+                        debuglocal(9,"NdpFindStart remote connection lost, rc = %d\n", rc);
                 }
 
@@ -1167 +1165 @@
 int APIENTRY NdpDiscardResourceData (HRESOURCE resource, NDDATABUF *pdatabuf)
 {
-    // The plugin do not have to deallocate anything
-    // because resource data did not contain any pointers
-    // to plugins data.
-    // Data stored by fsphSetResourceData will be
-    // deallocated by NetDrive.
+        // The plugin do not have to deallocate anything
+        // because resource data did not contain any pointers
+        // to plugins data.
+        // Data stored by fsphSetResourceData will be
+        // deallocated by NetDrive.
 
         debuglocal(9,"NdpDicardresourceData %d\n", 0);
@@ -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();
@@ -1792 +1787 @@
 int APIENTRY NdpIOCTL (int type, HRESOURCE resource, char *path, int function, void *in, ULONG insize, PULONG poutlen)
 {
-    if (function == ND_PL_INIT_THREAD)
-       {
-          smbwrp_initthread();
-          debuglocal(9, "NdpIOCTL init thread\n");
-          return NO_ERROR;
-       }
-
-    debuglocal(9,"NdpIOCTL <%s> %d\n", path, function);
-
-    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;
-    }
-
-    return ERROR_NOT_SUPPORTED;
+        if (function == ND_PL_INIT_THREAD)
+        {
+                smbwrp_initthread();
+                debuglocal(9, "NdpIOCTL init thread\n");
+                return NO_ERROR;
+        }
+
+        debuglocal(9,"NdpIOCTL <%s> %d\n", path, function);
+
+        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;
+        }
+
+        return ERROR_NOT_SUPPORTED;
 }
 
@@ -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);
 
@@ -2044 +2039 @@
                 pConn->file.openattr = attrFile;
                 fsphDosDateToUnixTime(pfi->stat.fdateLastWrite, pfi->stat.ftimeLastWrite, &(pConn->file.mtime));
+                fsphDosDateToUnixTime(pfi->stat.fdateCreation, pfi->stat.ftimeCreation, &(pConn->file.ctime));
+                pConn->file.updatetime = 2;
                 debug_printf("NdpFileSetInfo mtime %d\n", pConn->file.mtime);
         } while (0);
@@ -2180 +2177 @@
                 while (ulReadCompleted < ulRead)
                 {
-                        ULONG ulActual;
+                        ULONG ulActual;
                         ULONG ulToRead = ulRead - ulReadCompleted;
                         debuglocal(9,"NdpFileRead completed %d, to read %d\n", ulReadCompleted, ulToRead);
@@ -2227 +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);
 

trunk/client/src/nversion.tpl

@@ -6 +6 @@
 #define NDPSMB_BUILD    _BUILD_
 #define NDPSMB_INSTALL  _WPIVERSION_
-#define VERSION         "_VERSION_"
+#define VERSION         "_VERSION_"
 #define BUILD           "_BUILD_"
 #define OS              eCS (OS/2)

trunk/client/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)
+                void (*fn)(const char *name,
+                uint32 type,
+                const char *comment,
+                void *state),
+                void *state)
 {
         int i;
@@ -78 +78 @@
         info_ctr.ctr.ctr1 = &ctr1;
         status = rpccli_srvsvc_NetShareEnumAll(pipe_hnd, mem_ctx,
-                                              pipe_hnd->desthost,
-                                              &info_ctr,
-                                              0xffffffff,
-                                              &total_entries,
-                                              &resume_handle, 
-                                              &werr);
+                                                pipe_hnd->desthost,
+                                                &info_ctr,
+                                                0xffffffff,
+                                                &total_entries,
+                                                &resume_handle, 
+                                                &werr);
 
         /* Was it successful? */
@@ -128 +128 @@
         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");
+        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");
 
 }
@@ -201 +201 @@
 {
         /*
-         * Block SIGPIPE (from lib/util_sock.c: write())
-         * It is not needed and should not stop execution
-         */
+        Block SIGPIPE (from lib/util_sock.c: write())
+        It is not needed and should not stop execution
+        */
         BlockSignals(True, SIGPIPE);
 }
@@ -316 +316 @@
         char *rparam=NULL, *rdata=NULL;
         char *p;
-        
+
         param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
         if (!param) {
@@ -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;
         }
@@ -342 +342 @@
         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;
         }
@@ -635 +635 @@
         }
         file->fd = fd;
-        file->newmtime = 0;
+        file->updatetime = 0;
         file->offset = 0;
         return 0;
@@ -686 +686 @@
         }
 
-        file->newmtime = 1;
+        file->updatetime = 1;
         file->offset += ret;
         *result = ret;
@@ -703 +703 @@
         }
 
+        debuglocal(4,"smpwrp_close updatetime: %d\n", file->updatetime);
+
+        if (file->updatetime == 1)
+        {
+                file->mtime = time(NULL);
+                debuglocal(4,"cli_close new mtime %lu\n", file->mtime);
+        }
         
         if (!NT_STATUS_IS_OK(cli_close(cli, file->fd)))
         {
-                return os2cli_errno(cli);
-        }
-        if (file->newmtime)
-        {
-                file->newmtime = 0;
-                file->mtime = time(NULL);
-                debuglocal(4,"cli_close new mtime %lu\n", file->mtime);
-        }
+                rc = 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 (!NT_STATUS_IS_OK(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->ctime = 0;
+        file->updatetime = 0;
         file->fd = -1;
         file->offset = 0;
-        if (file->openattr || file->mtime)
-        {
-                debuglocal(4,"Set attr on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->mtime);
-                if (!NT_STATUS_IS_OK(cli_setatr(cli, file->fname, file->openattr, file->mtime))) 
-                {
-                        debuglocal(4,"Set attr on close failed %d\n", os2cli_errno(cli));
-                        //rc = os2cli_errno(cli);
-                }
-                
-                file->openattr = 0;
-                file->mtime = 0;
-        }
         *file->fname = 0;
         return rc;

trunk/client/src/smbwrp.h

@@ -91 +91 @@
         int denymode;
         unsigned long mtime;
-        int newmtime;
+        unsigned long ctime;
+        int updatetime; 
+        // 0 = time is not updated upon file close
+        // 1 = modified time is updated to current time
+        // 2 = create and modified time are updated according local file
         char fullname[261];
         char fname[261];