diff options
author | Nathan Scott <nathans@sgi.com> | 2002-09-04 23:19:54 +0000 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2002-09-04 23:19:54 +0000 |
commit | 43ceb48dc022f3c9eccbb25d7338a0e96490fc8d (patch) | |
tree | e366b6afd72c58f21970f83b0c76d59c340531d8 /libacl | |
parent | 4b46d0a5f341d70b558373f374f596a98275695d (diff) | |
download | acl-43ceb48dc022f3c9eccbb25d7338a0e96490fc8d.tar.gz |
minor updates from Andreas.
Diffstat (limited to 'libacl')
-rw-r--r-- | libacl/acl_delete_def_file.c | 2 | ||||
-rw-r--r-- | libacl/acl_extended_fd.c | 4 | ||||
-rw-r--r-- | libacl/acl_extended_file.c | 4 | ||||
-rw-r--r-- | libacl/acl_get_fd.c | 2 | ||||
-rw-r--r-- | libacl/acl_get_file.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libacl/acl_delete_def_file.c b/libacl/acl_delete_def_file.c index 152e2b3..a39788d 100644 --- a/libacl/acl_delete_def_file.c +++ b/libacl/acl_delete_def_file.c @@ -32,7 +32,7 @@ acl_delete_def_file(const char *path_p) int error; error = removexattr(path_p, ACL_EA_DEFAULT); - if (error < 0 && errno != ENOATTR) + if (error < 0 && errno != ENOATTR && errno != ENODATA) return -1; return 0; } diff --git a/libacl/acl_extended_fd.c b/libacl/acl_extended_fd.c index 8c2e944..99528cd 100644 --- a/libacl/acl_extended_fd.c +++ b/libacl/acl_extended_fd.c @@ -34,12 +34,12 @@ acl_extended_fd(int fd) int retval; retval = fgetxattr(fd, ACL_EA_ACCESS, NULL, 0); - if (retval < 0 && errno != ENOATTR) + if (retval < 0 && errno != ENOATTR && errno != ENODATA) return -1; if (retval > base_size) return 1; retval = fgetxattr(fd, ACL_EA_DEFAULT, NULL, 0); - if (retval < 0 && errno != ENOATTR) + if (retval < 0 && errno != ENOATTR && errno != ENODATA) return -1; if (retval >= base_size) return 1; diff --git a/libacl/acl_extended_file.c b/libacl/acl_extended_file.c index 4f7e9f0..26a9c3f 100644 --- a/libacl/acl_extended_file.c +++ b/libacl/acl_extended_file.c @@ -34,12 +34,12 @@ acl_extended_file(const char *path_p) int retval; retval = getxattr(path_p, ACL_EA_ACCESS, NULL, 0); - if (retval < 0 && errno != ENOATTR) + if (retval < 0 && errno != ENOATTR && errno != ENODATA) return -1; if (retval > base_size) return 1; retval = getxattr(path_p, ACL_EA_DEFAULT, NULL, 0); - if (retval < 0 && errno != ENOATTR) + if (retval < 0 && errno != ENOATTR && errno != ENODATA) return -1; if (retval >= base_size) return 1; diff --git a/libacl/acl_get_fd.c b/libacl/acl_get_fd.c index 3a3a65e..a9686d6 100644 --- a/libacl/acl_get_fd.c +++ b/libacl/acl_get_fd.c @@ -55,7 +55,7 @@ acl_get_fd(int fd) if (retval > 0) { acl_t acl = __acl_from_xattr(ext_acl_p, retval); return acl; - } else if (retval == 0 || errno == ENOATTR) { + } else if (retval == 0 || errno == ENOATTR || errno == ENODATA) { struct stat st; if (fstat(fd, &st) == 0) diff --git a/libacl/acl_get_file.c b/libacl/acl_get_file.c index 693ddf1..6cea121 100644 --- a/libacl/acl_get_file.c +++ b/libacl/acl_get_file.c @@ -68,7 +68,7 @@ acl_get_file(const char *path_p, acl_type_t type) if (retval > 0) { acl_t acl = __acl_from_xattr(ext_acl_p, retval); return acl; - } else if (retval == 0 || errno == ENOATTR) { + } else if (retval == 0 || errno == ENOATTR || errno == ENODATA) { struct stat st; if (stat(path_p, &st) != 0) |