svn commit: samba r12466 - in branches/SAMBA_3_0: . source/libsmb

[derrell at samba.org]

Author: derrell
Date: 2005-12-25 02:00:21 +0000 (Sun, 25 Dec 2005)
New Revision: 12466

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12466

Log:
 r12028 at cabra:  derrell | 2005-12-24 20:25:38 -0500
 parse dates correctly.  w_time and m_time were reversed.

Modified:
   branches/SAMBA_3_0/
   branches/SAMBA_3_0/source/libsmb/clirap.c
   branches/SAMBA_3_0/source/libsmb/libsmbclient.c


Changeset:

Property changes on: branches/SAMBA_3_0
___________________________________________________________________
Name: svk:merge
   - 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba3:11740
   + 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba3:12028

Modified: branches/SAMBA_3_0/source/libsmb/clirap.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/clirap.c	2005-12-25 01:33:35 UTC (rev 12465)
+++ branches/SAMBA_3_0/source/libsmb/clirap.c	2005-12-25 02:00:21 UTC (rev 12466)
@@ -592,19 +592,19 @@
 	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 (w_time) {
+		*w_time = interpret_long_date(rdata+16);
+	}
 	if (m_time) {
-		*m_time = interpret_long_date(rdata+16);
+		*m_time = interpret_long_date(rdata+24);
 	}
-	if (w_time) {
-		*w_time = interpret_long_date(rdata+24);
-	}
 	if (mode) {
 		*mode = SVAL(rdata, 32);
 	}

Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-12-25 01:33:35 UTC (rev 12465)
+++ branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-12-25 02:00:21 UTC (rev 12466)
@@ -1380,8 +1380,10 @@
 	}
   
 	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) {