Changeset 126 for branches/samba-3.0/source/ndpsmb/smbwrp.c

Timestamp:

Apr 7, 2008, 9:33:39 AM (17 years ago)

Author:

Yuri Dario

Message:

Fixes timezone handling for os2->xp->os2, os2->samba->os2. Partially fixes ticket:56.

File:

• branches/samba-3.0/source/ndpsmb/smbwrp.c (modified) (9 diffs)

branches/samba-3.0/source/ndpsmb/smbwrp.c

@@ -2 +2 @@
 
 #include "smbwrp.h"
+
+#ifndef DEBUG_PRINTF
+#define debug_printf( ...)
+#endif
 
 static int
@@ -273 +277 @@
 
         if (c_time) {
-                *c_time = convert_timespec_to_time_t(interpret_long_date(rdata+0)) - cli->serverzone;
+                *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)) - cli->serverzone;
+                *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)) - cli->serverzone;
+                *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)) - cli->serverzone;
+                *w_time = convert_timespec_to_time_t(interpret_long_date(rdata+24));
         }
         if (mode) {
@@ -344 +348 @@
 
         if (c_time) {
-                *c_time = convert_timespec_to_time_t(interpret_long_date(rdata+0)) - cli->serverzone;
+                *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)) - cli->serverzone;
+                *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)) - cli->serverzone;
+                *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)) - cli->serverzone;
+                *w_time = convert_timespec_to_time_t(interpret_long_date(rdata+24));
         }
         if (mode) {
@@ -609 +613 @@
         if (file->openattr || file->mtime)
         {
-                debuglocal(4,"Set attr on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->mtime + get_time_zone(file->mtime));
-                if (!cli_setatr(cli, file->fname, file->openattr, file->mtime + get_time_zone(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));
@@ -819 +823 @@
                 return EINVAL;
         }
+        debug_printf( "smbwrp_getattr\n");
         debuglocal(4,"getattr %d %d <%s>\n", cli->capabilities & CAP_NOPATHINFO2, cli->capabilities & CAP_NT_SMBS, finfo->fname);
         if (!(cli->capabilities & CAP_NOPATHINFO2) &&
@@ -868 +873 @@
         }
 
-        if (cli_getatr(cli, finfo->fname, (unsigned short *)&finfo->attr, (size_t *)&finfo->size, (time_t *)&finfo->mtime)) 
+        if (cli_getatr(cli, finfo->fname, (unsigned short *)&finfo->attr, &finfo->size, (time_t *)&finfo->mtime)) 
         {
 //debuglocal(2,("gotattr1 %08x <%s>\n", finfo->attr, finfo->fname));
@@ -1036 +1041 @@
         finfo->ctime = def_finfo.ctime_ts.tv_sec;
         strncpy(finfo->fname, def_finfo.name, sizeof(finfo->fname) - 1);
-
+        debug_printf( "fname %s (serverzone %d, level %d)\n",finfo->fname, cli->serverzone, level);
+        
         switch (level) {
                 case 1: /* OS/2 understands this */
@@ -1090 +1096 @@
                         /* Offset zero is "create time", not "change time". */
                         p += 8;
-                        finfo->atime = interpret_long_date(p).tv_sec - cli->serverzone;
+                        finfo->atime = interpret_long_date(p).tv_sec;
                         p += 8;
-                        finfo->mtime = interpret_long_date(p).tv_sec - cli->serverzone;
+                        finfo->mtime = interpret_long_date(p).tv_sec;
                         p += 8;
-                        finfo->ctime = interpret_long_date(p).tv_sec - cli->serverzone;
+                        finfo->ctime = interpret_long_date(p).tv_sec;
                         p += 8;
                         finfo->size = IVAL2_TO_SMB_BIG_UINT(p,0);
@@ -1404 +1410 @@
         }
         debuglocal(1,"Filelist <%s> on master <%s> wgrp <%s> server <%s> share <%s> clidev <%s>\n", state->mask, srv->master, srv->workgroup, srv->server_name, srv->share_name, cli->dev);
+        debug_printf( "Filelist <%s> on master <%s> wgrp <%s> server <%s> share <%s> clidev <%s>\n", state->mask, srv->master, srv->workgroup, srv->server_name, srv->share_name, cli->dev);
         if (*srv->workgroup == 0 && *srv->server_name == 0) 
         {