s3:utils: let smbstatus report anonymous signing/encryption explicitly

[samba.git] / source3 / modules / nfs4acl_xattr_xdr.c

diff --git a/source3/modules/nfs4acl_xattr_xdr.c b/source3/modules/nfs4acl_xattr_xdr.c
index ebe990215fa9d833ea499cabb1ee1e0312565983..439378eeb19cdc393739ade1771820abfd494fa5 100644 (file)
--- a/source3/modules/nfs4acl_xattr_xdr.c
+++ b/source3/modules/nfs4acl_xattr_xdr.c
@@ -36,9 +36,13 @@
 #undef FALSE
 #endif
 
+#ifdef HAVE_RPC_TYPES_H
+#include <rpc/types.h>
+#endif
 #include <rpc/xdr.h>
 #include "nfs41acl.h"
 #include "nfs4acl_xattr_xdr.h"
+#include "nfs4acl_xattr_util.h"
 
 static unsigned nfs4acli_get_naces(nfsacl41i *nacl)
 {
@@ -69,7 +73,7 @@ static size_t nfs4acli_get_xdrblob_size(nfsacl41i *nacl)
        acl_size = sizeof(aclflag4) + sizeof(unsigned);
 
        if (naces > NFS4ACL_XDR_MAX_ACES) {
-               DBG_ERR("Too many ACEs: %u", naces);
+               DBG_ERR("Too many ACEs: %u\n", naces);
                return 0;
        }
 
@@ -122,23 +126,6 @@ static nfsace4i *nfs4acli_get_ace(nfsacl41i *nacl, size_t n)
        return &nacl->na41_aces.na41_aces_val[n];
 }
 
-static unsigned smb4acl_to_nfs4acl_flags(uint16_t smb4acl_flags)
-{
-       unsigned nfs4acl_flags = 0;
-
-       if (smb4acl_flags & SEC_DESC_DACL_AUTO_INHERITED) {
-               nfs4acl_flags |= ACL4_AUTO_INHERIT;
-       }
-       if (smb4acl_flags & SEC_DESC_DACL_PROTECTED) {
-               nfs4acl_flags |= ACL4_PROTECTED;
-       }
-       if (smb4acl_flags & SEC_DESC_DACL_DEFAULTED) {
-               nfs4acl_flags |= ACL4_DEFAULTED;
-       }
-
-       return nfs4acl_flags;
-}
-
 static bool smb4acl_to_nfs4acli(vfs_handle_struct *handle,
                                TALLOC_CTX *mem_ctx,
                                struct SMB4ACL_T *smb4acl,
@@ -255,23 +242,6 @@ NTSTATUS nfs4acl_smb4acl_to_xdr_blob(vfs_handle_struct *handle,
        return NT_STATUS_OK;
 }
 
-static uint16_t nfs4acl_to_smb4acl_flags(unsigned nfsacl41_flags)
-{
-       uint16_t smb4acl_flags = SEC_DESC_SELF_RELATIVE;
-
-       if (nfsacl41_flags & ACL4_AUTO_INHERIT) {
-               smb4acl_flags |= SEC_DESC_DACL_AUTO_INHERITED;
-       }
-       if (nfsacl41_flags & ACL4_PROTECTED) {
-               smb4acl_flags |= SEC_DESC_DACL_PROTECTED;
-       }
-       if (nfsacl41_flags & ACL4_DEFAULTED) {
-               smb4acl_flags |= SEC_DESC_DACL_DEFAULTED;
-       }
-
-       return smb4acl_flags;
-}
-
 static NTSTATUS nfs4acl_xdr_blob_to_nfs4acli(struct vfs_handle_struct *handle,
                                             TALLOC_CTX *mem_ctx,
                                             DATA_BLOB *blob,
@@ -316,7 +286,7 @@ static NTSTATUS nfs4acli_to_smb4acl(struct vfs_handle_struct *handle,
        unsigned nfsacl41_flag = 0;
        uint16_t smb4acl_flags = 0;
        unsigned naces = nfs4acli_get_naces(nacl);
-       int i;
+       unsigned i;
 
        SMB_VFS_HANDLE_GET_DATA(handle, config,
                                struct nfs4acl_config,