diff options
author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2009-09-07 16:19:32 +0000 |
---|---|---|
committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2009-09-07 16:19:32 +0000 |
commit | 3f22187878a4406a0e30cf1820b7243dcb2c8bf7 (patch) | |
tree | 4446fd2ed5aacce2cb2f6bf981a090397df53767 /bin/setfacl/setfacl.h | |
parent | 2ef29b4c336fc0e19274abd74d16e8ce56af7ddd (diff) | |
download | src-3f22187878a4406a0e30cf1820b7243dcb2c8bf7.tar.gz src-3f22187878a4406a0e30cf1820b7243dcb2c8bf7.zip |
Add NFSv4 support to setfacl(1).
Reviewed by: rwatson
Notes
Notes:
svn path=/head/; revision=196936
Diffstat (limited to 'bin/setfacl/setfacl.h')
-rw-r--r-- | bin/setfacl/setfacl.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/bin/setfacl/setfacl.h b/bin/setfacl/setfacl.h index bdf052ba0a81..7c11b3a14f7c 100644 --- a/bin/setfacl/setfacl.h +++ b/bin/setfacl/setfacl.h @@ -38,15 +38,14 @@ #define OP_REMOVE_DEF 0x01 /* remove default acl's (-k) */ #define OP_REMOVE_EXT 0x02 /* remove extended acl's (-b) */ #define OP_REMOVE_ACL 0x03 /* remove acl's (-xX) */ - -/* ACL types for the acl array */ -#define ACCESS_ACL 0 -#define DEFAULT_ACL 1 +#define OP_REMOVE_BY_NUMBER 0x04 /* remove acl's (-xX) by acl entry number */ +#define OP_ADD_ACL 0x05 /* add acls entries at a given position */ /* TAILQ entry for acl operations */ struct sf_entry { uint op; acl_t acl; + uint entry_number; TAILQ_ENTRY(sf_entry) next; }; TAILQ_HEAD(, sf_entry) entrylist; @@ -61,21 +60,21 @@ TAILQ_HEAD(, sf_file) filelist; /* files.c */ acl_t get_acl_from_file(const char *filename); /* merge.c */ -int merge_acl(acl_t acl, acl_t *prev_acl); +int merge_acl(acl_t acl, acl_t *prev_acl, const char *filename); +int add_acl(acl_t acl, uint entry_number, acl_t *prev_acl, const char *filename); /* remove.c */ -int remove_acl(acl_t acl, acl_t *prev_acl); -int remove_default(acl_t *prev_acl); -void remove_ext(acl_t *prev_acl); +int remove_acl(acl_t acl, acl_t *prev_acl, const char *filename); +int remove_by_number(uint entry_number, acl_t *prev_acl, const char *filename); +int remove_default(acl_t *prev_acl, const char *filename); +void remove_ext(acl_t *prev_acl, const char *filename); /* mask.c */ -int set_acl_mask(acl_t *prev_acl); +int set_acl_mask(acl_t *prev_acl, const char *filename); /* util.c */ void *zmalloc(size_t size); -acl_type_t acl_type; uint have_mask; uint need_mask; uint have_stdin; -uint h_flag; uint n_flag; #endif /* _SETFACL_H */ |