The branch, v3-6-test has been updated
via 3d14ed9 s3-spoolss: fix debug statement in
spoolss_addprinterex_level_2().
via 317b5d8 s3-smbd: fix the AIX 5.3 build.
from 9953e69 tdb_backup: avoid transaction on backup file, use lockall
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 3d14ed92bb698a5f0f33c10f65cc840b330bb65c
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
(cherry picked from commit 0cf9b47725b50fd916a7ca56ca3f7e9c9263411a)
commit 317b5d8fad7320f186c71b64d4d0470be634c71d
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
(cherry picked from commit ae61a5c3d05192457f5a0b24dd9bd34317df566f)
-----------------------------------------------------------------------
Summary of changes:
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 +++
5 files changed, 11 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
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);
}
--
Samba Shared Repository
