blob: e6270bf478a7df18ba166ce810cfa6c2a0a0bec7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
From c96b248f388587ebcff23d3a2625054899badcff Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@snoopy.citi.umich.edu>
Date: Tue, 12 Dec 2006 17:25:43 -0500
Subject: [PATCH 10/17] Minor header cleanup
Move a define out of common header to where it's actually used.
---
include/libacl_nfs4.h | 4 ----
libacl/acl_ptn4_acl_trans.c | 3 +++
libacl/libacl_nfs4.h | 4 ----
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/include/libacl_nfs4.h b/include/libacl_nfs4.h
index c3d7ef3..b29b802 100644
--- a/include/libacl_nfs4.h
+++ b/include/libacl_nfs4.h
@@ -16,10 +16,6 @@
NFS4_ACE_SYNCHRONIZE)
#define NFS4_OWNER_MODE (NFS4_ACE_WRITE_ATTRIBUTES | NFS4_ACE_WRITE_ACL)
-/* flags used to simulate posix default ACLs */
-#define NFS4_INHERITANCE_FLAGS (NFS4_ACE_FILE_INHERIT_ACE \
- | NFS4_ACE_DIRECTORY_INHERIT_ACE | NFS4_ACE_INHERIT_ONLY_ACE)
-
#define NFS4_ACE_MASK_IGNORE (NFS4_ACE_DELETE | NFS4_ACE_WRITE_OWNER \
| NFS4_ACE_READ_NAMED_ATTRS | NFS4_ACE_WRITE_NAMED_ATTRS)
/* XXX not sure about the following. Note that e.g. DELETE_CHILD is wrong in
diff --git a/libacl/acl_ptn4_acl_trans.c b/libacl/acl_ptn4_acl_trans.c
index 2e5aa51..3c23f01 100644
--- a/libacl/acl_ptn4_acl_trans.c
+++ b/libacl/acl_ptn4_acl_trans.c
@@ -38,6 +38,9 @@
#include <nfsidmap.h>
#include "libacl_nfs4.h"
+/* flags used to simulate posix default ACLs */
+#define NFS4_INHERITANCE_FLAGS (NFS4_ACE_FILE_INHERIT_ACE \
+ | NFS4_ACE_DIRECTORY_INHERIT_ACE | NFS4_ACE_INHERIT_ONLY_ACE)
/* Plan:
* 1: if setting default, remove all purely inherited aces, and replace
diff --git a/libacl/libacl_nfs4.h b/libacl/libacl_nfs4.h
index c3d7ef3..b29b802 100644
--- a/libacl/libacl_nfs4.h
+++ b/libacl/libacl_nfs4.h
@@ -16,10 +16,6 @@
NFS4_ACE_SYNCHRONIZE)
#define NFS4_OWNER_MODE (NFS4_ACE_WRITE_ATTRIBUTES | NFS4_ACE_WRITE_ACL)
-/* flags used to simulate posix default ACLs */
-#define NFS4_INHERITANCE_FLAGS (NFS4_ACE_FILE_INHERIT_ACE \
- | NFS4_ACE_DIRECTORY_INHERIT_ACE | NFS4_ACE_INHERIT_ONLY_ACE)
-
#define NFS4_ACE_MASK_IGNORE (NFS4_ACE_DELETE | NFS4_ACE_WRITE_OWNER \
| NFS4_ACE_READ_NAMED_ATTRS | NFS4_ACE_WRITE_NAMED_ATTRS)
/* XXX not sure about the following. Note that e.g. DELETE_CHILD is wrong in
--
1.7.8.1
|
GitWeb
