[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  c8bf9495f43 vfs: fix the build of nfs4acl_xattr_ without rpc/xdr.h support
      from  3b9ccfa4ac7 net: use correct printf format, fi3_id is an uint32_t

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c8bf9495f43ed677f90e59937e1e805fc5e60d49
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Mar 27 04:34:12 2019 +0100

    vfs: fix the build of nfs4acl_xattr_ without rpc/xdr.h support
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Fri Nov 25 06:07:32 UTC 2022 on sn-devel-184

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

Summary of changes:
 source3/modules/nfs4acl_xattr_nfs.c  | 1 +
 source3/modules/nfs4acl_xattr_util.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/nfs4acl_xattr_nfs.c b/source3/modules/nfs4acl_xattr_nfs.c
index 59e02bf1577..698630f3e6f 100644
--- a/source3/modules/nfs4acl_xattr_nfs.c
+++ b/source3/modules/nfs4acl_xattr_nfs.c
@@ -874,6 +874,7 @@ NTSTATUS nfs4acl_nfs_blob_to_smb4(struct vfs_handle_struct *handle,
 }
 
 #else /* !HAVE_RPC_XDR_H */
+#include "nfs4_acls.h"
 #include "nfs4acl_xattr_nfs.h"
 NTSTATUS nfs4acl_nfs_blob_to_smb4(struct vfs_handle_struct *handle,
 				  TALLOC_CTX *mem_ctx,
diff --git a/source3/modules/nfs4acl_xattr_util.c b/source3/modules/nfs4acl_xattr_util.c
index 8ea1e76ad17..998dbf2df4d 100644
--- a/source3/modules/nfs4acl_xattr_util.c
+++ b/source3/modules/nfs4acl_xattr_util.c
@@ -29,7 +29,6 @@
 #ifdef FALSE
 #undef FALSE
 #endif
-#endif
 
 #include "nfs4_acls.h"
 #include "nfs41acl.h"
@@ -71,3 +70,4 @@ uint16_t nfs4acl_to_smb4acl_flags(unsigned nfsacl41_flags)
 
 	return smb4acl_flags;
 }
+#endif /* HAVE_RPC_XDR_H */


-- 
Samba Shared Repository