From 45b218a2676681aa16f4bc92578abae99cad4921 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 8 Jun 2008 23:55:37 +0200 Subject: [PATCH] Add me as co-author. --- ChangeLog | 7 +++++++ lib/acl-internal.h | 2 +- lib/copy-acl.c | 12 ++++++------ lib/file-has-acl.c | 2 +- lib/set-mode-acl.c | 10 +++++----- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f3db0f71..07026ff14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-06-08 Bruno Haible + * lib/acl-internal.h: Add me as co-author. + * lib/file-has-acl.c: Likewise. + * lib/set-mode-acl.c: Likewise. + * lib/copy-acl.c: Likewise. + +2008-06-08 Bruno Haible + Add support for AIX ACLs. * lib/acl-internal.h (acl_nontrivial): New declaration. * lib/file-has-acl.c (acl_nontrivial): New function. diff --git a/lib/acl-internal.h b/lib/acl-internal.h index 74d67aeb8..b365af687 100644 --- a/lib/acl-internal.h +++ b/lib/acl-internal.h @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . - Written by Paul Eggert and Andreas Gruenbacher. */ + Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible. */ #include "acl.h" diff --git a/lib/copy-acl.c b/lib/copy-acl.c index 780865cef..0f5931bc3 100644 --- a/lib/copy-acl.c +++ b/lib/copy-acl.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . - Written by Paul Eggert and Andreas Gruenbacher. */ + Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible. */ #include @@ -57,7 +57,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, if (ACL_NOT_WELL_SUPPORTED (errno)) return qset_acl (dst_name, dest_desc, mode); else - return -2; + return -2; } if (HAVE_ACL_SET_FD && dest_desc != -1) @@ -69,7 +69,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, int saved_errno = errno; if (ACL_NOT_WELL_SUPPORTED (errno) && !acl_access_nontrivial (acl)) - { + { acl_free (acl); return chmod_or_fchmod (dst_name, dest_desc, mode); } @@ -108,7 +108,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, return -1; } else - acl_free (acl); + acl_free (acl); } return 0; @@ -144,7 +144,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, if (ACL_NOT_WELL_SUPPORTED (errno)) return qset_acl (dst_name, dest_desc, mode); else - return -2; + return -2; } if (HAVE_ACL_SET_FD && dest_desc != -1) @@ -156,7 +156,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, int saved_errno = errno; if (ACL_NOT_WELL_SUPPORTED (errno) && !acl_extended_nontrivial (acl)) - { + { acl_free (acl); return chmod_or_fchmod (dst_name, dest_desc, mode); } diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c index 37a0ee1cd..9589db965 100644 --- a/lib/file-has-acl.c +++ b/lib/file-has-acl.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . - Written by Paul Eggert and Andreas Gruenbacher. */ + Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible. */ #include diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c index 7ef39cfa2..6aa708c2c 100644 --- a/lib/set-mode-acl.c +++ b/lib/set-mode-acl.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . - Written by Paul Eggert and Andreas Gruenbacher. */ + Written by Paul Eggert and Andreas Gruenbacher, and Bruno Haible. */ #include @@ -131,7 +131,7 @@ qset_acl (char const *name, int desc, mode_t mode) if (mode & (S_ISUID | S_ISGID | S_ISVTX)) { /* We did not call chmod so far, so the special bits have not yet - been set. */ + been set. */ return chmod_or_fchmod (name, desc, mode); } return 0; @@ -304,11 +304,11 @@ qset_acl (char const *name, int desc, mode_t mode) return -1; } } - + if (!MODE_INSIDE_ACL || (mode & (S_ISUID | S_ISGID | S_ISVTX))) { /* We did not call chmod so far, so the special bits have not yet - been set. */ + been set. */ return chmod_or_fchmod (name, desc, mode); } return 0; @@ -348,7 +348,7 @@ qset_acl (char const *name, int desc, mode_t mode) return chmod_or_fchmod (name, desc, mode); return -1; } - + if (mode & (S_ISUID | S_ISGID | S_ISVTX)) { /* We did not call chmod so far, so the special bits have not yet -- 2.11.0