[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  839196f Remove extra unused credit arg. to smbd_smb2_request_setup_out() (cherry picked from commit 7a835a6b42c49d70b599ab7c651f7aa871d8c605)
       via  663ed45 s3:selftest: fix knownfail for samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old
      from  bccb901 s3-selftest: support differing VFSLIBDIR in autoconf and waf build.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 839196fddbce84fcb152e29f0b85d2b4499cc8be
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Dec 13 13:17:49 2010 -0800

    Remove extra unused credit arg. to smbd_smb2_request_setup_out()
    (cherry picked from commit 7a835a6b42c49d70b599ab7c651f7aa871d8c605)

commit 663ed4583f60ad4a6c26514e072faf6b19e9dd42
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Dec 13 12:04:28 2010 +0100

    s3:selftest: fix knownfail for samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old
    
    The name is in lowercase since commit 35fbc7bbda5851f7172538f79fc79be201f1d521
    (s4-smbtorture: Make test names lowercase and dot-separated.)
    
    This should avoid intermittent failures in make test.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Dec 13 13:52:18 CET 2010 on sn-devel-104
    (cherry picked from commit 4ce3b53f122afb1eb3eaa3fbc2b8ef7fa8d075f5)

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

Summary of changes:
 source3/selftest/knownfail |    2 +-
 source3/smbd/smb2_server.c |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail
index c00d031..54cffa8 100644
--- a/source3/selftest/knownfail
+++ b/source3/selftest/knownfail
@@ -1,5 +1,5 @@
 .*printer.*print_test_extended # fails on some hosts due to timing issues ?
 .*printer.*print_test # fails on some hosts due to timing issues ?
 samba3.posix_s3.rap.printing # fails sometimes on sn-devel
-samba3.posix_s3.rpc.spoolss.*PRINTSERVER.enum_printers_old
+samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old # fails on some hosts due to timing issues ?
 samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another intermittent failure
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 9ed74fc..d2baed7 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -481,7 +481,7 @@ static void smb2_calculate_credits(const struct smbd_smb2_request *inreq,
 	}
 }
 
-static NTSTATUS smbd_smb2_request_setup_out(struct smbd_smb2_request *req, uint16_t creds)
+static NTSTATUS smbd_smb2_request_setup_out(struct smbd_smb2_request *req)
 {
 	struct iovec *vector;
 	int count;
@@ -2178,7 +2178,7 @@ void smbd_smb2_first_negprot(struct smbd_server_connection *sconn,
 		return;
 	}
 
-	status = smbd_smb2_request_setup_out(req, 1);
+	status = smbd_smb2_request_setup_out(req);
 	if (!NT_STATUS_IS_OK(status)) {
 		smbd_server_connection_terminate(sconn, nt_errstr(status));
 		return;
@@ -2233,7 +2233,7 @@ static void smbd_smb2_request_incoming(struct tevent_req *subreq)
 		return;
 	}
 
-	status = smbd_smb2_request_setup_out(req, 5);
+	status = smbd_smb2_request_setup_out(req);
 	if (!NT_STATUS_IS_OK(status)) {
 		smbd_server_connection_terminate(sconn, nt_errstr(status));
 		return;


-- 
Samba Shared Repository