svn commit: samba r12469 - in trunk: . examples/libsmbclient source/libsmb

[derrell at samba.org]

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

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

Log:
 r12035 at cabra:  derrell | 2005-12-24 21:07:11 -0500
 merge changes from 3_0

Modified:
   trunk/
   trunk/examples/libsmbclient/Makefile
   trunk/examples/libsmbclient/teststat.c
   trunk/source/libsmb/clirap.c
   trunk/source/libsmb/libsmbclient.c


Changeset:

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba-trunk:11773
   + 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba-trunk:12035

Modified: trunk/examples/libsmbclient/Makefile
===================================================================
--- trunk/examples/libsmbclient/Makefile	2005-12-25 02:03:51 UTC (rev 12468)
+++ trunk/examples/libsmbclient/Makefile	2005-12-25 02:10:21 UTC (rev 12469)
@@ -17,6 +17,7 @@
 	testbrowse \
 	testbrowse2 \
 	teststat \
+	teststat2 \
 	testchmod \
 	testutime \
 	testread
@@ -47,6 +48,10 @@
 	@echo Linking teststat
 	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ /usr/local/samba/lib/libsmbclient.so -lpopt $<
 
+teststat2: teststat2.o
+	@echo Linking teststat2
+	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ /usr/local/samba/lib/libsmbclient.so -lpopt $<
+
 testchmod: testchmod.o
 	@echo Linking testchmod
 	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ /usr/local/samba/lib/libsmbclient.so -lpopt $<

Modified: trunk/examples/libsmbclient/teststat.c
===================================================================
--- trunk/examples/libsmbclient/teststat.c	2005-12-25 02:03:51 UTC (rev 12468)
+++ trunk/examples/libsmbclient/teststat.c	2005-12-25 02:10:21 UTC (rev 12469)
@@ -48,7 +48,7 @@
         return 1;
     }
     
-    printf("SAMBA\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
+    printf("\nSAMBA\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
            st.st_mtime, ctime_r(&st.st_mtime, mtime),
            st.st_ctime, ctime_r(&st.st_ctime, ctime),
            st.st_atime, ctime_r(&st.st_atime, atime)); 

Modified: trunk/source/libsmb/clirap.c
===================================================================
--- trunk/source/libsmb/clirap.c	2005-12-25 02:03:51 UTC (rev 12468)
+++ trunk/source/libsmb/clirap.c	2005-12-25 02:10:21 UTC (rev 12469)
@@ -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: trunk/source/libsmb/libsmbclient.c
===================================================================
--- trunk/source/libsmb/libsmbclient.c	2005-12-25 02:03:51 UTC (rev 12468)
+++ trunk/source/libsmb/libsmbclient.c	2005-12-25 02:10:21 UTC (rev 12469)
@@ -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) {