s3: fix build on systems with struct stat member st_flags

[ira/wip.git] / source3 / include / includes.h

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 80d7bfc6cfa577a75e3e7dbd4d9260ce40165abd..ba3866a03a1448a8062b1c89ce82a96c3e96130e 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -435,13 +435,35 @@ typedef uint64_t br_off;
  * Type for stat structure.
  */
 
-#ifndef SMB_STRUCT_STAT
-#  if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STAT64) && defined(HAVE_OFF64_T)
-#    define SMB_STRUCT_STAT struct stat64
-#  else
-#    define SMB_STRUCT_STAT struct stat
-#  endif
-#endif
+struct stat_ex {
+       dev_t           st_ex_dev;
+       ino_t           st_ex_ino;
+       mode_t          st_ex_mode;
+       nlink_t         st_ex_nlink;
+       uid_t           st_ex_uid;
+       gid_t           st_ex_gid;
+       dev_t           st_ex_rdev;
+       off_t           st_ex_size;
+       struct timespec st_ex_atime;
+       struct timespec st_ex_mtime;
+       struct timespec st_ex_ctime;
+       struct timespec st_ex_btime; /* birthtime */
+       blksize_t       st_ex_blksize;
+       blkcnt_t        st_ex_blocks;
+#ifdef HAVE_STAT_ST_FLAGS
+       uint32_t        st_ex_flags;
+#endif
+
+       /*
+        * Add space for VFS internal extensions. The initial user of this
+        * would be the onefs modules, passing the snapid from the stat calls
+        * to the file_id_create call. Maybe we'll have to expand this later,
+        * but the core of Samba should never look at this field.
+        */
+       uint64_t vfs_private;
+};
+
+typedef struct stat_ex SMB_STRUCT_STAT;
 
 /*
  * Type for dirent structure.
@@ -577,22 +599,20 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "../talloc/talloc.h"
 
 #include "event.h"
+#include "../lib/util/tevent_unix.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 #include "../lib/util/data_blob.h"
 #include "../lib/util/time.h"
 #include "../lib/util/asn1.h"
 
-/* And a little extension. Abort on type mismatch */
-#define talloc_get_type_abort(ptr, type) \
-       (type *)talloc_check_name_abort(ptr, #type)
-
 #include "ads.h"
 #include "ads_dns.h"
 #include "interfaces.h"
 #include "trans2.h"
 #include "../libcli/util/error.h"
 #include "ntioctl.h"
-#include "charset.h"
+#include "../lib/util/charset/charset.h"
 #include "dynconfig.h"
 #include "util_getent.h"
 #include "debugparse.h"
@@ -600,6 +620,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "messages.h"
 #include "locking.h"
 #include "smb_perfcount.h"
+#include "smb_signing.h"
 #include "smb.h"
 #include "nameserv.h"
 #include "secrets.h"
@@ -610,7 +631,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "mapping.h"
 #include "passdb.h"
 #include "rpc_secdes.h"
-#include "gpo.h"
+#include "../libgpo/gpo.h"
 #include "authdata.h"
 #include "msdfs.h"
 #include "rap.h"
@@ -624,7 +645,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "ntdomain.h"
 #include "reg_objects.h"
 #include "reg_db.h"
-#include "rpc_spoolss.h"
 #include "rpc_perfcount.h"
 #include "rpc_perfcount_defs.h"
 #include "librpc/gen_ndr/notify.h"
@@ -648,11 +668,12 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "ctdbd_conn.h"
 #include "../lib/util/talloc_stack.h"
 #include "memcache.h"
-#include "../lib/async_req/async_req_ntstatus.h"
 #include "async_smb.h"
 #include "../lib/async_req/async_sock.h"
 #include "services.h"
 #include "eventlog.h"
+#include "../lib/util/smb_threads.h"
+#include "../lib/util/smb_threads_internal.h"
 
 #include "lib/smbconf/smbconf.h"
 #include "lib/smbconf/smbconf_init.h"
@@ -701,6 +722,9 @@ enum flush_reason_enum {
 #ifndef NO_PROTO_H
 #include "proto.h"
 #endif
+#include "libcli/security/secace.h"
+#include "libcli/security/secacl.h"
+#include "libcli/security/security_descriptor.h"
 
 #if defined(HAVE_POSIX_ACLS)
 #include "modules/vfs_posixacl.h"
@@ -901,9 +925,10 @@ krb5_error_code smb_krb5_parse_name(krb5_context context,
                                const char *name, /* in unix charset */
                                 krb5_principal *principal);
 
-krb5_error_code smb_krb5_unparse_name(krb5_context context,
-                               krb5_const_principal principal,
-                               char **unix_name);
+krb5_error_code smb_krb5_unparse_name(TALLOC_CTX *mem_ctx,
+                                     krb5_context context,
+                                     krb5_const_principal principal,
+                                     char **unix_name);
 
 #ifndef HAVE_KRB5_SET_REAL_TIME
 krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds);