From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 27 Mar 2019 03:34:12 +0000 (+0100)
Subject: vfs: fix the build of nfs4acl_xattr_ without rpc/xdr.h support
X-Git-Tag: talloc-2.4.0~478
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8bf9495f43ed677f90e59937e1e805fc5e60d49;p=thirdparty%2Fsamba.git

vfs: fix the build of nfs4acl_xattr_ without rpc/xdr.h support

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Fri Nov 25 06:07:32 UTC 2022 on sn-devel-184
---

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 */