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

[Günther Deschner]

The branch, v3-6-test has been updated
       via  c65b54c s3-build: move MAP_FILE define to the only place used.
       via  bb88fda s4-smbtorture: restructure documentname handling in spoolss test a bit.
      from  3d14ed9 s3-spoolss: fix debug statement in spoolss_addprinterex_level_2().

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


- Log -----------------------------------------------------------------
commit c65b54c8ee1b9c1982eb81a1d7fa43ae46c0a378
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 20 18:21:25 2011 +0200

    s3-build: move MAP_FILE define to the only place used.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed Apr 20 19:16:47 CEST 2011 on sn-devel-104
    (cherry picked from commit 0b89ce671250daddc86400ef4e1996c37c126025)

commit bb88fdade421b0226805d32c448fa1be9eb7faa5
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 20 17:53:43 2011 +0200

    s4-smbtorture: restructure documentname handling in spoolss test a bit.
    
    Guenther
    (cherry picked from commit c8f9515f193e634da2ef01c525e2a05a3d519862)

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

Summary of changes:
 source3/include/includes.h     |    4 ----
 source3/modules/vfs_aio_fork.c |    4 ++++
 source4/torture/rpc/spoolss.c  |    7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 536dc45..54459a5 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -580,10 +580,6 @@ enum flush_reason_enum {
 #define SIGRTMIN NSIG
 #endif
 
-#ifndef MAP_FILE
-#define MAP_FILE 0
-#endif
-
 #if defined(HAVE_PUTPRPWNAM) && defined(AUTH_CLEARTEXT_SEG_CHARS)
 #define OSF1_ENH_SEC 1
 #endif
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index 881bc51..41b5a89 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -24,6 +24,10 @@
 #include "system/shmem.h"
 #include "smbd/smbd.h"
 
+#ifndef MAP_FILE
+#define MAP_FILE 0
+#endif
+
 struct mmap_area {
 	size_t size;
 	volatile void *ptr;
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 6ba1c3d..3809136 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -3256,6 +3256,7 @@ static bool test_EnumJobs_args(struct torture_context *tctx,
 static bool test_DoPrintTest_add_one_job(struct torture_context *tctx,
 					 struct dcerpc_binding_handle *b,
 					 struct policy_handle *handle,
+					 const char *document_name,
 					 uint32_t *job_id)
 {
 	NTSTATUS status;
@@ -3274,7 +3275,7 @@ static bool test_DoPrintTest_add_one_job(struct torture_context *tctx,
 	s.in.level		= 1;
 	s.in.info.info1		= &info1;
 	s.out.job_id		= job_id;
-	info1.document_name	= "TorturePrintJob";
+	info1.document_name	= document_name;
 	info1.output_file	= NULL;
 	info1.datatype		= "RAW";
 
@@ -3417,7 +3418,7 @@ static bool test_DoPrintTest(struct torture_context *tctx,
 	job_ids = talloc_zero_array(tctx, uint32_t, num_jobs);
 
 	for (i=0; i < num_jobs; i++) {
-		ret &= test_DoPrintTest_add_one_job(tctx, b, handle, &job_ids[i]);
+		ret &= test_DoPrintTest_add_one_job(tctx, b, handle, "TorturePrintJob", &job_ids[i]);
 	}
 
 	for (i=0; i < num_jobs; i++) {
@@ -3444,7 +3445,7 @@ static bool test_DoPrintTest_extended(struct torture_context *tctx,
 	job_ids = talloc_zero_array(tctx, uint32_t, num_jobs);
 
 	for (i=0; i < num_jobs; i++) {
-		ret &= test_DoPrintTest_add_one_job(tctx, b, handle, &job_ids[i]);
+		ret &= test_DoPrintTest_add_one_job(tctx, b, handle, "TorturePrintJob", &job_ids[i]);
 	}
 
 	ret &= test_DoPrintTest_check_jobs(tctx, b, handle, num_jobs, job_ids);


-- 
Samba Shared Repository