s3-smbd: fix the AIX 5.3 build.

(AIX defines open to be open64)

Guenther

diff --git a/source3/modules/vfs_aixacl_util.c b/source3/modules/vfs_aixacl_util.c
index 768d0f33585df0f8c3be732b2cca3027ca6e2ebe..d867f9d92fcf07e4bae65e1dbe61a1a19512d429 100644 (file)
--- 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 859b212048608b742e172d30707c90582a14fab2..4e993e16664aefa6f8384ad26fd29bfdeec3c43a 100644 (file)
--- 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 1b236106280cc98dca6184b7b3b5500884c705c4..b7198d36322fc315a14ae722088620737330fd29 100644 (file)
--- 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/smbd/vfs.c b/source3/smbd/vfs.c
index 0438f7934edd35cf326d3815fac3e5aef573731d..aaa713e48090090e9d69b2244ed2983480192daa 100644 (file)
--- 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);
 }