[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  849648c lib: Make async_sock includable on its own
       via  f01013b s4-torture: Fix some nonemtpy blank lines
      from  456f821 s3: Fix indentation of if-expressions

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 849648cdb2ee07d5a0ec687bf5eba900db5c9001
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Aug 12 14:29:26 2012 +0200

    lib: Make async_sock includable on its own
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Tue Sep 25 18:03:46 CEST 2012 on sn-devel-104

commit f01013b1a47b3dcd6e8099fe69895136e5bab5ad
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Sep 13 16:52:44 2012 +0200

    s4-torture: Fix some nonemtpy blank lines

-----------------------------------------------------------------------

Summary of changes:
 lib/async_req/async_sock.h         |    1 +
 source4/torture/basic/delaywrite.c |   24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/async_req/async_sock.h b/lib/async_req/async_sock.h
index 1910643..af917bc 100644
--- a/lib/async_req/async_sock.h
+++ b/lib/async_req/async_sock.h
@@ -26,6 +26,7 @@
 
 #include <talloc.h>
 #include <tevent.h>
+#include "system/network.h"
 
 struct tevent_req *sendto_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
 			       int fd, const void *buf, size_t len, int flags,
diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c
index 15482d8..23a17d5 100644
--- a/source4/torture/basic/delaywrite.c
+++ b/source4/torture/basic/delaywrite.c
@@ -1262,42 +1262,42 @@ static bool test_finfo_after_write(struct torture_context *tctx, struct smbcli_s
 		ret = false;
 		goto done;
 	}
-	
+
 	written =  smbcli_write(cli2->tree, fnum2, 0, "x", 0, 1);
-	
+
 	if (written != 1) {
 		torture_result(tctx, TORTURE_FAIL, __location__": written gave %d - should have been 1", 
 		       (int)written);
 		ret = false;
 		goto done;
 	}
-	
+
 	finfo2.basic_info.level = RAW_FILEINFO_BASIC_INFO;
 	finfo2.basic_info.in.file.path = fname;
-	
+
 	status = smb_raw_pathinfo(cli2->tree, tctx, &finfo2);
-	
+
 	if (!NT_STATUS_IS_OK(status)) {
 		torture_result(tctx, TORTURE_FAIL, __location__": fileinfo failed: %s", 
 			  nt_errstr(status));
 		ret = false;
 		goto done;
 	}
-	
+
 	if (finfo1.basic_info.out.create_time !=
 	    finfo2.basic_info.out.create_time) {
 		torture_result(tctx, TORTURE_FAIL, __location__": create_time changed");
 		ret = false;
 		goto done;
 	}
-	
+
 	if (finfo1.basic_info.out.access_time !=
 	    finfo2.basic_info.out.access_time) {
 		torture_result(tctx, TORTURE_FAIL, __location__": access_time changed");
 		ret = false;
 		goto done;
 	}
-	
+
 	if (finfo1.basic_info.out.write_time !=
 	    finfo2.basic_info.out.write_time) {
 		torture_result(tctx, TORTURE_FAIL, __location__": write_time changed:\n"
@@ -1307,19 +1307,19 @@ static bool test_finfo_after_write(struct torture_context *tctx, struct smbcli_s
 		ret = false;
 		goto done;
 	}
-	
+
 	if (finfo1.basic_info.out.change_time !=
 	    finfo2.basic_info.out.change_time) {
 		torture_result(tctx, TORTURE_FAIL, __location__": change_time changed");
 		ret = false;
 		goto done;
 	}
-	
+
 	/* One of the two following calls updates the qpathinfo. */
-	
+
 	/* If you had skipped the smbcli_write on fnum2, it would
 	 * *not* have updated the stat on disk */
-	
+
 	smbcli_close(cli2->tree, fnum2);
 	cli2 = NULL;
 


-- 
Samba Shared Repository