r12466: r12028@cabra: derrell | 2005-12-24 20:25:38 -0500

 parse dates correctly.  w_time and m_time were reversed.
(This used to be commit 481abfbab40209e087c82eadc15c3697eae0ae5b)

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index 172dea4090ab62d1f7a9df8aa6c8eb2a54cfa7d1..6716971fe2cb7fb4c3f6f8e18b5077d38d3a10fb 100644 (file)
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -592,18 +592,18 @@ BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname,
        if (!rdata || data_len < 22) {
                return False;
        }
-
+        
        if (c_time) {
                 *c_time = interpret_long_date(rdata+0);
        }
        if (a_time) {
                *a_time = interpret_long_date(rdata+8);
        }
-       if (m_time) {
-               *m_time = interpret_long_date(rdata+16);
-       }
        if (w_time) {
-               *w_time = interpret_long_date(rdata+24);
+               *w_time = interpret_long_date(rdata+16);
+       }
+       if (m_time) {
+               *m_time = interpret_long_date(rdata+24);
        }
        if (mode) {
                *mode = SVAL(rdata, 32);

diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c
index 15210664b078d5b2043718ebd2277a3ea301e761..623977b39e7a83af34c589554a34f8f4c9df6c19 100644 (file)
--- a/source3/libsmb/libsmbclient.c
+++ b/source3/libsmb/libsmbclient.c
@@ -1380,8 +1380,10 @@ static BOOL smbc_getatr(SMBCCTX * context, SMBCSRV *srv, char *path,
        }
   
        if (!srv->no_pathinfo2 &&
-               cli_qpathinfo2(targetcli, targetpath, c_time, a_time, m_time, NULL,
-                          size, mode, ino)) return True;
+            cli_qpathinfo2(targetcli, targetpath,
+                           c_time, a_time, m_time, NULL, size, mode, ino)) {
+            return True;
+        }
 
        /* if this is NT then don't bother with the getatr */
        if (targetcli->capabilities & CAP_NT_SMBS) {