[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  566a2e6 Fix tevent testsuite issue on Solaris.
       via  c3ee49a Solaris/Illumos/Nexenta creates pipes that are bi-directional by default.
      from  9624ca4 BUG 9735: Fix winbind seperator in upn to username conversion.

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


- Log -----------------------------------------------------------------
commit 566a2e6828bb5d6ea3a35e24938675a296bbe95b
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Mar 8 13:44:08 2013 -0800

    Fix tevent testsuite issue on Solaris.
    
    On Solaris/Nexenta/Illumos once a pipe is full it will not be reported
    as writable until PIPE_BUF (actually on Solaris 4096, which is less than
    PIPE_BUF) bytes have been read from it.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Fri Mar 22 18:16:45 CET 2013 on sn-devel-104

commit c3ee49a09944cec9ee1e41c32dd31bdc170f610c
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Mar 8 10:09:01 2013 -0800

    Solaris/Illumos/Nexenta creates pipes that are bi-directional by default.
    
    Ensure the test code will pass against such a system (allow writes/reads
    going both ways).
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 lib/tevent/testsuite.c |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c
index 8e3f4af..7851c6c 100644
--- a/lib/tevent/testsuite.c
+++ b/lib/tevent/testsuite.c
@@ -60,22 +60,28 @@ static void fde_handler_write(struct tevent_context *ev_ctx, struct tevent_fd *f
 }
 
 
-/* These should never fire... */
+/* This will only fire if the fd's returned from pipe() are bi-directional. */
 static void fde_handler_read_1(struct tevent_context *ev_ctx, struct tevent_fd *f,
 			uint16_t flags, void *private_data)
 {
-	struct torture_context *test = (struct torture_context *)private_data;
-	torture_comment(test, "fde_handler_read_1 should never fire !\n");
-	abort();
+	int *fd = (int *)private_data;
+	char c;
+#ifdef SA_SIGINFO
+	kill(getpid(), SIGUSR1);
+#endif
+	kill(getpid(), SIGALRM);
+
+	read(fd[1], &c, 1);
+	fde_count++;
 }
 
-/* These should never fire... */
+/* This will only fire if the fd's returned from pipe() are bi-directional. */
 static void fde_handler_write_1(struct tevent_context *ev_ctx, struct tevent_fd *f,
 			uint16_t flags, void *private_data)
 {
-	struct torture_context *test = (struct torture_context *)private_data;
-	torture_comment(test, "fde_handler_write_1 should never fire !\n");
-	abort();
+	int *fd = (int *)private_data;
+	char c = 0;
+	write(fd[0], &c, 1);
 }
 
 static void finished_handler(struct tevent_context *ev_ctx, struct tevent_timer *te,
@@ -133,12 +139,12 @@ static bool test_event_context(struct torture_context *test,
 	fde_read = tevent_add_fd(ev_ctx, ev_ctx, fd[0], TEVENT_FD_READ,
 			    fde_handler_read, fd);
 	fde_write_1 = tevent_add_fd(ev_ctx, ev_ctx, fd[0], TEVENT_FD_WRITE,
-			    fde_handler_write_1, test);
+			    fde_handler_write_1, fd);
 
 	fde_write = tevent_add_fd(ev_ctx, ev_ctx, fd[1], TEVENT_FD_WRITE,
 			    fde_handler_write, fd);
 	fde_read_1 = tevent_add_fd(ev_ctx, ev_ctx, fd[1], TEVENT_FD_READ,
-			    fde_handler_read_1, test);
+			    fde_handler_read_1, fd);
 
 	tevent_fd_set_auto_close(fde_read);
 	tevent_fd_set_auto_close(fde_write);
@@ -476,8 +482,13 @@ static void test_event_fd2_sock_handler(struct tevent_context *ev_ctx,
 		return;
 	}
 
-	if (oth_sock->num_read > 0) {
+	if (oth_sock->num_read >= PIPE_BUF) {
 		/*
+		 * On Linux we become writable once we've read
+		 * one byte. On Solaris we only become writable
+		 * again once we've read 4096 bytes. PIPE_BUF
+		 * is probably a safe bet to test against.
+		 *
 		 * There should be room to write a byte again
 		 */
 		if (!(flags & TEVENT_FD_WRITE)) {


-- 
Samba Shared Repository