The branch, master has been updated
via 0b89ce6 s3-build: move MAP_FILE define to the only place used.
via ae61a5c s3-smbd: fix the AIX 5.3 build.
via c8f9515 s4-smbtorture: restructure documentname handling in spoolss
test a bit.
via 0cf9b47 s3-spoolss: fix debug statement in
spoolss_addprinterex_level_2().
from 6f846dd lib/util/charset Always set *converted_size even on failure
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0b89ce671250daddc86400ef4e1996c37c126025
Author: Günther Deschner <[email protected]>
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 <[email protected]>
Autobuild-Date: Wed Apr 20 19:16:47 CEST 2011 on sn-devel-104
commit ae61a5c3d05192457f5a0b24dd9bd34317df566f
Author: Günther Deschner <[email protected]>
Date: Wed Apr 20 17:54:24 2011 +0200
s3-smbd: fix the AIX 5.3 build.
(AIX defines open to be open64)
Guenther
commit c8f9515f193e634da2ef01c525e2a05a3d519862
Author: Günther Deschner <[email protected]>
Date: Wed Apr 20 17:53:43 2011 +0200
s4-smbtorture: restructure documentname handling in spoolss test a bit.
Guenther
commit 0cf9b47725b50fd916a7ca56ca3f7e9c9263411a
Author: Günther Deschner <[email protected]>
Date: Wed Apr 20 17:19:15 2011 +0200
s3-spoolss: fix debug statement in spoolss_addprinterex_level_2().
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/include/includes.h | 4 ----
source3/modules/vfs_aio_fork.c | 4 ++++
source3/modules/vfs_aixacl_util.c | 1 +
source3/modules/vfs_default.c | 4 ++++
source3/printing/print_aix.c | 1 +
source3/rpc_server/spoolss/srv_spoolss_nt.c | 4 ++--
source3/smbd/vfs.c | 3 +++
source4/torture/rpc/spoolss.c | 7 ++++---
8 files changed, 19 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 1dac73a..a76942f 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/source3/modules/vfs_aixacl_util.c
b/source3/modules/vfs_aixacl_util.c
index 768d0f3..d867f9d 100644
--- a/source3/modules/vfs_aixacl_util.c
+++ b/source3/modules/vfs_aixacl_util.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "system/filesys.h"
#include "smbd/smbd.h"
SMB_ACL_T aixacl_to_smbacl(struct acl *file_acl)
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 859b212..4e993e1 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1649,6 +1649,10 @@ static int vfswrap_set_offline(struct vfs_handle_struct
*handle,
return -1;
}
+#ifdef AIX
+#undef open /* AIX defines open to be open64 */
+#endif
+
static struct vfs_fn_pointers vfs_default_fns = {
/* Disk operations */
diff --git a/source3/printing/print_aix.c b/source3/printing/print_aix.c
index 1b23610..b7198d3 100644
--- a/source3/printing/print_aix.c
+++ b/source3/printing/print_aix.c
@@ -25,6 +25,7 @@
*/
#include "includes.h"
+#include "system/filesys.h"
#include "printing/pcap.h"
#ifdef AIX
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c
b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 4a78aa4..312f509 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -7857,8 +7857,8 @@ static WERROR spoolss_addprinterex_level_2(struct
pipes_struct *p,
return WERR_ACCESS_DENIED;
}
} else {
- DEBUG(0,("spoolss_addprinterex_level_2: add printer for printer
%s called and no"
- "smb.conf parameter \"addprinter command\" is defined.
This"
+ DEBUG(0,("spoolss_addprinterex_level_2: add printer for printer
%s called and no "
+ "smb.conf parameter \"addprinter command\" is defined.
This "
"parameter must exist for this call to succeed\n",
info2->sharename ));
}
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 0438f79..aaa713e 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1273,6 +1273,9 @@ int smb_vfs_call_open(struct vfs_handle_struct *handle,
struct smb_filename *smb_fname, struct files_struct *fsp,
int flags, mode_t mode)
{
+#ifdef AIX
+#undef open /* AIX defines open to be open64 */
+#endif
VFS_FIND(open);
return handle->fns->open(handle, smb_fname, fsp, flags, mode);
}
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
