[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  0e2d1cf... s4-smbtorture: pick correct last packet while checking backchannel replies in RPC-SPOOLSS-NOTIFY.
      from  1ead839... s3-selftest: try to get RPC-SPOOLSS-NOTIFY running during make test on the buildfarm.

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


- Log -----------------------------------------------------------------
commit 0e2d1cf9c4067dfce80a21ebf735d7d6a823d55e
Author: Günther Deschner <gd at samba.org>
Date:   Wed Jan 27 15:04:00 2010 +0100

    s4-smbtorture: pick correct last packet while checking backchannel replies in RPC-SPOOLSS-NOTIFY.
    
    Guenther

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

Summary of changes:
 source4/torture/rpc/spoolss_notify.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c
index e5e52d6..dac8950 100644
--- a/source4/torture/rpc/spoolss_notify.c
+++ b/source4/torture/rpc/spoolss_notify.c
@@ -354,12 +354,20 @@ static bool test_start_dcerpc_server(struct torture_context *tctx,
 	return true;
 }
 
+static struct received_packet *last_packet(struct received_packet *p)
+{
+	struct received_packet *tmp;
+	for (tmp = p; tmp->next; tmp = tmp->next) ;;
+	return tmp;
+}
+
 static bool test_RFFPCNEx(struct torture_context *tctx,
 			  struct dcerpc_pipe *p)
 {
 	struct dcesrv_context *dce_ctx;
 	struct policy_handle handle;
 	const char *address;
+	struct received_packet *tmp;
 
 	received_packets = NULL;
 
@@ -372,8 +380,8 @@ static bool test_RFFPCNEx(struct torture_context *tctx,
 	torture_assert_int_equal(tctx, received_packets->opnum, NDR_SPOOLSS_REPLYOPENPRINTER,
 		"no ReplyOpenPrinter packet after RemoteFindFirstPrinterChangeNotifyEx");
 	torture_assert(tctx, test_ClosePrinter(tctx, p, &handle), "");
-	torture_assert(tctx, received_packets, "no packets received");
-	torture_assert_int_equal(tctx, received_packets->opnum, NDR_SPOOLSS_REPLYCLOSEPRINTER,
+	tmp = last_packet(received_packets);
+	torture_assert_int_equal(tctx, tmp->opnum, NDR_SPOOLSS_REPLYCLOSEPRINTER,
 		"no ReplyClosePrinter packet after ClosePrinter");
 
 	/* Shut down DCE/RPC server */


-- 
Samba Shared Repository