2015-09-25 07:21:58 +00:00
|
|
|
/* Test whether a file has a nontrivial ACL. -*- coding: utf-8 -*-
|
Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 21:34:03 +00:00
|
|
|
|
2022-01-01 07:45:51 +00:00
|
|
|
Copyright (C) 2002-2003, 2005-2022 Free Software Foundation, Inc.
|
Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 21:34:03 +00:00
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
2017-09-13 09:07:03 +00:00
|
|
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 21:34:03 +00:00
|
|
|
|
|
|
|
Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible. */
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include "acl.h"
|
|
|
|
|
|
|
|
#include "acl-internal.h"
|
|
|
|
|
Update from Gnulib
This incorporates:
2018-10-05 explicit_bzero: make it possible to namespace
2018-10-04 fcntl: make it possible to namespace
2018-10-01 mkostemp, mkostemps: fix C++ compilation on Mac OS X
2018-09-19 maint: mktime.c now shared with glibc
2018-09-18 file-has-acl: fix test failure on Cygwin 2.9
2018-09-18 gettime: nanotime never existed
* admin/merge-gnulib (AVOIDED_MODULES): Add mkdir.
* doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h:
* lib/acl_entries.c, lib/explicit_bzero.c, lib/fcntl.c:
* lib/get-permissions.c, lib/gettime.c, lib/mktime.c:
* lib/set-permissions.c, lib/stdlib.in.h, m4/acl.m4, m4/gettime.m4:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
2018-10-09 01:21:47 +00:00
|
|
|
#if USE_ACL && HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */
|
Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 21:34:03 +00:00
|
|
|
|
|
|
|
# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
|
|
|
|
|
|
|
|
/* ACL is an ACL, from a file, stored as type ACL_TYPE_EXTENDED.
|
|
|
|
Return 1 if the given ACL is non-trivial.
|
|
|
|
Return 0 if it is trivial. */
|
|
|
|
int
|
|
|
|
acl_extended_nontrivial (acl_t acl)
|
|
|
|
{
|
|
|
|
/* acl is non-trivial if it is non-empty. */
|
|
|
|
return (acl_entries (acl) > 0);
|
|
|
|
}
|
|
|
|
|
Update from Gnulib
This incorporates:
2018-10-05 explicit_bzero: make it possible to namespace
2018-10-04 fcntl: make it possible to namespace
2018-10-01 mkostemp, mkostemps: fix C++ compilation on Mac OS X
2018-09-19 maint: mktime.c now shared with glibc
2018-09-18 file-has-acl: fix test failure on Cygwin 2.9
2018-09-18 gettime: nanotime never existed
* admin/merge-gnulib (AVOIDED_MODULES): Add mkdir.
* doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h:
* lib/acl_entries.c, lib/explicit_bzero.c, lib/fcntl.c:
* lib/get-permissions.c, lib/gettime.c, lib/mktime.c:
* lib/set-permissions.c, lib/stdlib.in.h, m4/acl.m4, m4/gettime.m4:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
2018-10-09 01:21:47 +00:00
|
|
|
# else /* Linux, FreeBSD, IRIX, Tru64, Cygwin >= 2.5 */
|
Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 21:34:03 +00:00
|
|
|
|
|
|
|
/* ACL is an ACL, from a file, stored as type ACL_TYPE_ACCESS.
|
|
|
|
Return 1 if the given ACL is non-trivial.
|
|
|
|
Return 0 if it is trivial, i.e. equivalent to a simple stat() mode.
|
|
|
|
Return -1 and set errno upon failure to determine it. */
|
|
|
|
int
|
|
|
|
acl_access_nontrivial (acl_t acl)
|
|
|
|
{
|
|
|
|
/* acl is non-trivial if it has some entries other than for "user::",
|
|
|
|
"group::", and "other::". Normally these three should be present
|
|
|
|
at least, allowing us to write
|
|
|
|
return (3 < acl_entries (acl));
|
|
|
|
but the following code is more robust. */
|
Update from Gnulib
This incorporates:
2018-10-05 explicit_bzero: make it possible to namespace
2018-10-04 fcntl: make it possible to namespace
2018-10-01 mkostemp, mkostemps: fix C++ compilation on Mac OS X
2018-09-19 maint: mktime.c now shared with glibc
2018-09-18 file-has-acl: fix test failure on Cygwin 2.9
2018-09-18 gettime: nanotime never existed
* admin/merge-gnulib (AVOIDED_MODULES): Add mkdir.
* doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h:
* lib/acl_entries.c, lib/explicit_bzero.c, lib/fcntl.c:
* lib/get-permissions.c, lib/gettime.c, lib/mktime.c:
* lib/set-permissions.c, lib/stdlib.in.h, m4/acl.m4, m4/gettime.m4:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
2018-10-09 01:21:47 +00:00
|
|
|
# if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, Cygwin >= 2.5 */
|
Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 21:34:03 +00:00
|
|
|
|
|
|
|
acl_entry_t ace;
|
|
|
|
int got_one;
|
|
|
|
|
|
|
|
for (got_one = acl_get_entry (acl, ACL_FIRST_ENTRY, &ace);
|
|
|
|
got_one > 0;
|
|
|
|
got_one = acl_get_entry (acl, ACL_NEXT_ENTRY, &ace))
|
|
|
|
{
|
|
|
|
acl_tag_t tag;
|
|
|
|
if (acl_get_tag_type (ace, &tag) < 0)
|
|
|
|
return -1;
|
|
|
|
if (!(tag == ACL_USER_OBJ || tag == ACL_GROUP_OBJ || tag == ACL_OTHER))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return got_one;
|
|
|
|
|
2013-12-17 20:43:43 +00:00
|
|
|
# elif HAVE_ACL_TO_SHORT_TEXT /* IRIX */
|
Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 21:34:03 +00:00
|
|
|
/* Don't use acl_get_entry: it is undocumented. */
|
|
|
|
|
|
|
|
int count = acl->acl_cnt;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
{
|
|
|
|
acl_entry_t ace = &acl->acl_entry[i];
|
|
|
|
acl_tag_t tag = ace->ae_tag;
|
|
|
|
|
|
|
|
if (!(tag == ACL_USER_OBJ || tag == ACL_GROUP_OBJ
|
|
|
|
|| tag == ACL_OTHER_OBJ))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
2013-12-17 20:43:43 +00:00
|
|
|
# elif HAVE_ACL_FREE_TEXT /* Tru64 */
|
Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 21:34:03 +00:00
|
|
|
/* Don't use acl_get_entry: it takes only one argument and does not work. */
|
|
|
|
|
|
|
|
int count = acl->acl_num;
|
|
|
|
acl_entry_t ace;
|
|
|
|
|
|
|
|
for (ace = acl->acl_first; count > 0; ace = ace->next, count--)
|
|
|
|
{
|
|
|
|
acl_tag_t tag;
|
|
|
|
acl_perm_t perm;
|
|
|
|
|
|
|
|
tag = ace->entry->acl_type;
|
|
|
|
if (!(tag == ACL_USER_OBJ || tag == ACL_GROUP_OBJ || tag == ACL_OTHER))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
perm = ace->entry->acl_perm;
|
|
|
|
/* On Tru64, perm can also contain non-standard bits such as
|
|
|
|
PERM_INSERT, PERM_DELETE, PERM_MODIFY, PERM_LOOKUP, ... */
|
|
|
|
if ((perm & ~(ACL_READ | ACL_WRITE | ACL_EXECUTE)) != 0)
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
2013-12-17 20:43:43 +00:00
|
|
|
# else
|
|
|
|
|
|
|
|
errno = ENOSYS;
|
|
|
|
return -1;
|
Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 21:34:03 +00:00
|
|
|
# endif
|
|
|
|
}
|
|
|
|
|
2015-07-15 05:29:16 +00:00
|
|
|
int
|
|
|
|
acl_default_nontrivial (acl_t acl)
|
|
|
|
{
|
|
|
|
/* acl is non-trivial if it is non-empty. */
|
|
|
|
return (acl_entries (acl) > 0);
|
|
|
|
}
|
|
|
|
|
Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 21:34:03 +00:00
|
|
|
# endif
|
|
|
|
|
Update from Gnulib
This incorporates:
2018-10-05 explicit_bzero: make it possible to namespace
2018-10-04 fcntl: make it possible to namespace
2018-10-01 mkostemp, mkostemps: fix C++ compilation on Mac OS X
2018-09-19 maint: mktime.c now shared with glibc
2018-09-18 file-has-acl: fix test failure on Cygwin 2.9
2018-09-18 gettime: nanotime never existed
* admin/merge-gnulib (AVOIDED_MODULES): Add mkdir.
* doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h:
* lib/acl_entries.c, lib/explicit_bzero.c, lib/fcntl.c:
* lib/get-permissions.c, lib/gettime.c, lib/mktime.c:
* lib/set-permissions.c, lib/stdlib.in.h, m4/acl.m4, m4/gettime.m4:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
2018-10-09 01:21:47 +00:00
|
|
|
#elif USE_ACL && HAVE_FACL && defined GETACL /* Solaris, Cygwin < 2.5, not HP-UX */
|
Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 21:34:03 +00:00
|
|
|
|
|
|
|
/* Test an ACL retrieved with GETACL.
|
|
|
|
Return 1 if the given ACL, consisting of COUNT entries, is non-trivial.
|
|
|
|
Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */
|
|
|
|
int
|
|
|
|
acl_nontrivial (int count, aclent_t *entries)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
{
|
|
|
|
aclent_t *ace = &entries[i];
|
|
|
|
|
|
|
|
/* Note: If ace->a_type = USER_OBJ, ace->a_id is the st_uid from stat().
|
|
|
|
If ace->a_type = GROUP_OBJ, ace->a_id is the st_gid from stat().
|
|
|
|
We don't need to check ace->a_id in these cases. */
|
|
|
|
if (!(ace->a_type == USER_OBJ
|
|
|
|
|| ace->a_type == GROUP_OBJ
|
|
|
|
|| ace->a_type == OTHER_OBJ
|
|
|
|
/* Note: Cygwin does not return a CLASS_OBJ ("mask:") entry
|
|
|
|
sometimes. */
|
|
|
|
|| ace->a_type == CLASS_OBJ))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
# ifdef ACE_GETACL
|
|
|
|
|
|
|
|
/* A shortcut for a bitmask. */
|
|
|
|
# define NEW_ACE_WRITEA_DATA (NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA)
|
|
|
|
|
|
|
|
/* Test an ACL retrieved with ACE_GETACL.
|
|
|
|
Return 1 if the given ACL, consisting of COUNT entries, is non-trivial.
|
|
|
|
Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */
|
|
|
|
int
|
|
|
|
acl_ace_nontrivial (int count, ace_t *entries)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* The flags in the ace_t structure changed in a binary incompatible way
|
|
|
|
when ACL_NO_TRIVIAL etc. were introduced in <sys/acl.h> version 1.15.
|
|
|
|
How to distinguish the two conventions at runtime?
|
|
|
|
In the old convention, usually three ACEs have a_flags = ACE_OWNER /
|
|
|
|
ACE_GROUP / ACE_OTHER, in the range 0x0100..0x0400. In the new
|
|
|
|
convention, these values are not used. */
|
|
|
|
int old_convention = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
if (entries[i].a_flags & (OLD_ACE_OWNER | OLD_ACE_GROUP | OLD_ACE_OTHER))
|
|
|
|
{
|
|
|
|
old_convention = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (old_convention)
|
|
|
|
/* Running on Solaris 10. */
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
{
|
|
|
|
ace_t *ace = &entries[i];
|
|
|
|
|
|
|
|
/* Note:
|
|
|
|
If ace->a_flags = ACE_OWNER, ace->a_who is the st_uid from stat().
|
|
|
|
If ace->a_flags = ACE_GROUP, ace->a_who is the st_gid from stat().
|
|
|
|
We don't need to check ace->a_who in these cases. */
|
|
|
|
if (!(ace->a_type == OLD_ALLOW
|
|
|
|
&& (ace->a_flags == OLD_ACE_OWNER
|
|
|
|
|| ace->a_flags == OLD_ACE_GROUP
|
|
|
|
|| ace->a_flags == OLD_ACE_OTHER)))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Running on Solaris 10 (newer version) or Solaris 11. */
|
|
|
|
unsigned int access_masks[6] =
|
|
|
|
{
|
|
|
|
0, /* owner@ deny */
|
|
|
|
0, /* owner@ allow */
|
|
|
|
0, /* group@ deny */
|
|
|
|
0, /* group@ allow */
|
|
|
|
0, /* everyone@ deny */
|
|
|
|
0 /* everyone@ allow */
|
|
|
|
};
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
{
|
|
|
|
ace_t *ace = &entries[i];
|
|
|
|
unsigned int index1;
|
|
|
|
unsigned int index2;
|
|
|
|
|
|
|
|
if (ace->a_type == NEW_ACE_ACCESS_ALLOWED_ACE_TYPE)
|
|
|
|
index1 = 1;
|
|
|
|
else if (ace->a_type == NEW_ACE_ACCESS_DENIED_ACE_TYPE)
|
|
|
|
index1 = 0;
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (ace->a_flags == NEW_ACE_OWNER)
|
|
|
|
index2 = 0;
|
|
|
|
else if (ace->a_flags == (NEW_ACE_GROUP | NEW_ACE_IDENTIFIER_GROUP))
|
|
|
|
index2 = 2;
|
|
|
|
else if (ace->a_flags == NEW_ACE_EVERYONE)
|
|
|
|
index2 = 4;
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
access_masks[index1 + index2] |= ace->a_access_mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The same bit shouldn't be both allowed and denied. */
|
|
|
|
if (access_masks[0] & access_masks[1])
|
|
|
|
return 1;
|
|
|
|
if (access_masks[2] & access_masks[3])
|
|
|
|
return 1;
|
|
|
|
if (access_masks[4] & access_masks[5])
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/* Check minimum masks. */
|
|
|
|
if ((NEW_ACE_WRITE_NAMED_ATTRS
|
|
|
|
| NEW_ACE_WRITE_ATTRIBUTES
|
|
|
|
| NEW_ACE_WRITE_ACL
|
|
|
|
| NEW_ACE_WRITE_OWNER)
|
|
|
|
& ~ access_masks[1])
|
|
|
|
return 1;
|
|
|
|
access_masks[1] &= ~(NEW_ACE_WRITE_NAMED_ATTRS
|
|
|
|
| NEW_ACE_WRITE_ATTRIBUTES
|
|
|
|
| NEW_ACE_WRITE_ACL
|
|
|
|
| NEW_ACE_WRITE_OWNER);
|
|
|
|
if ((NEW_ACE_READ_NAMED_ATTRS
|
|
|
|
| NEW_ACE_READ_ATTRIBUTES
|
|
|
|
| NEW_ACE_READ_ACL
|
|
|
|
| NEW_ACE_SYNCHRONIZE)
|
|
|
|
& ~ access_masks[5])
|
|
|
|
return 1;
|
|
|
|
access_masks[5] &= ~(NEW_ACE_READ_NAMED_ATTRS
|
|
|
|
| NEW_ACE_READ_ATTRIBUTES
|
|
|
|
| NEW_ACE_READ_ACL
|
|
|
|
| NEW_ACE_SYNCHRONIZE);
|
|
|
|
|
|
|
|
/* Check the allowed or denied bits. */
|
|
|
|
switch ((access_masks[0] | access_masks[1])
|
|
|
|
& ~(NEW_ACE_READ_NAMED_ATTRS
|
|
|
|
| NEW_ACE_READ_ATTRIBUTES
|
|
|
|
| NEW_ACE_READ_ACL
|
|
|
|
| NEW_ACE_SYNCHRONIZE))
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
case NEW_ACE_READ_DATA:
|
|
|
|
case NEW_ACE_WRITEA_DATA:
|
|
|
|
case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA:
|
|
|
|
case NEW_ACE_EXECUTE:
|
|
|
|
case NEW_ACE_READ_DATA | NEW_ACE_EXECUTE:
|
|
|
|
case NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE:
|
|
|
|
case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
switch ((access_masks[2] | access_masks[3])
|
|
|
|
& ~(NEW_ACE_READ_NAMED_ATTRS
|
|
|
|
| NEW_ACE_READ_ATTRIBUTES
|
|
|
|
| NEW_ACE_READ_ACL
|
|
|
|
| NEW_ACE_SYNCHRONIZE))
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
case NEW_ACE_READ_DATA:
|
|
|
|
case NEW_ACE_WRITEA_DATA:
|
|
|
|
case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA:
|
|
|
|
case NEW_ACE_EXECUTE:
|
|
|
|
case NEW_ACE_READ_DATA | NEW_ACE_EXECUTE:
|
|
|
|
case NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE:
|
|
|
|
case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
switch ((access_masks[4] | access_masks[5])
|
|
|
|
& ~(NEW_ACE_WRITE_NAMED_ATTRS
|
|
|
|
| NEW_ACE_WRITE_ATTRIBUTES
|
|
|
|
| NEW_ACE_WRITE_ACL
|
|
|
|
| NEW_ACE_WRITE_OWNER))
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
case NEW_ACE_READ_DATA:
|
|
|
|
case NEW_ACE_WRITEA_DATA:
|
|
|
|
case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA:
|
|
|
|
case NEW_ACE_EXECUTE:
|
|
|
|
case NEW_ACE_READ_DATA | NEW_ACE_EXECUTE:
|
|
|
|
case NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE:
|
|
|
|
case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check that the NEW_ACE_WRITE_DATA and NEW_ACE_APPEND_DATA bits are
|
|
|
|
either both allowed or both denied. */
|
|
|
|
if (((access_masks[0] & NEW_ACE_WRITE_DATA) != 0)
|
|
|
|
!= ((access_masks[0] & NEW_ACE_APPEND_DATA) != 0))
|
|
|
|
return 1;
|
|
|
|
if (((access_masks[2] & NEW_ACE_WRITE_DATA) != 0)
|
|
|
|
!= ((access_masks[2] & NEW_ACE_APPEND_DATA) != 0))
|
|
|
|
return 1;
|
|
|
|
if (((access_masks[4] & NEW_ACE_WRITE_DATA) != 0)
|
|
|
|
!= ((access_masks[4] & NEW_ACE_APPEND_DATA) != 0))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
# endif
|
|
|
|
|
|
|
|
#elif USE_ACL && HAVE_GETACL /* HP-UX */
|
|
|
|
|
|
|
|
/* Return 1 if the given ACL is non-trivial.
|
|
|
|
Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */
|
|
|
|
int
|
2015-04-25 05:39:47 +00:00
|
|
|
acl_nontrivial (int count, struct acl_entry *entries)
|
Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 21:34:03 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2015-04-25 05:39:47 +00:00
|
|
|
if (count > 3)
|
|
|
|
return 1;
|
|
|
|
|
Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 21:34:03 +00:00
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
{
|
|
|
|
struct acl_entry *ace = &entries[i];
|
|
|
|
|
2015-04-25 05:39:47 +00:00
|
|
|
if (ace->uid != ACL_NSUSER && ace->gid != ACL_NSGROUP)
|
Update from Gnulib
This incorporates:
2018-06-29 regex: glibc does not use intprops.h
2018-06-28 regex: port to recently proposed glibc regex merge
2018-06-25 Continue to use spaces for indentation, not tabs
2018-06-25 manywarnings: Don't enable -Wjump-misses-init by default
2018-06-25 acl-internal.h: remove _GL_ATTRIBUTE_CONST on void function
2018-06-24 manywarnings: accommodate GCC 9: remove -Wchkp and -Wabi
2018-06-24 maint: clarify comments about sticky EOF
2018-06-24 af_alg: avoid hangs when reading from streams
2018-06-17 crypto: use byteswap
2018-06-17 getloadavg: Return 0 on MS-Windows without Cygwi
2018-06-17 getloadavg: Allow building on MS-Windows without Cygwin
* build-aux/config.guess, build-aux/config.sub, doc/misc/texinfo.tex:
* lib/acl-internal.c, lib/acl-internal.h, lib/get-permissions.c:
* lib/getloadavg.c, lib/gettimeofday.c, lib/md5.c, lib/pselect.c:
* lib/set-permissions.c, lib/sha1.c, lib/sha256.c, lib/sha512.c:
* lib/time.in.h, m4/getloadavg.m4, m4/gnulib-common.m4:
* m4/manywarnings.m4, m4/pthread_sigmask.m4, m4/vararrays.m4:
Copy from Gnulib.
2018-06-30 00:31:04 +00:00
|
|
|
return 1;
|
Use Gnulib ACL implementation, for benefit of Solaris etc.
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
* etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
* nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL.
* nt/inc/ms-w32.h (EOPNOTSUPP): New macro.
* src/Makefile.in (LIB_ACL): New macro.
(LIBACL_LIBS): Remove.
(LIBES): Use LIB_ACL, not LIBACL_LIBS.
* src/fileio.c: Include <acl.h>.
Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
(ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by
!acl_errno_valid.
(Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
it ourselves.
Fixes: debbugs:14295
2013-05-07 21:34:03 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
# if HAVE_ACLV_H /* HP-UX >= 11.11 */
|
|
|
|
|
|
|
|
/* Return 1 if the given ACL is non-trivial.
|
|
|
|
Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */
|
|
|
|
int
|
|
|
|
aclv_nontrivial (int count, struct acl *entries)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
{
|
|
|
|
struct acl *ace = &entries[i];
|
|
|
|
|
|
|
|
/* Note: If ace->a_type = USER_OBJ, ace->a_id is the st_uid from stat().
|
|
|
|
If ace->a_type = GROUP_OBJ, ace->a_id is the st_gid from stat().
|
|
|
|
We don't need to check ace->a_id in these cases. */
|
|
|
|
if (!(ace->a_type == USER_OBJ /* no need to check ace->a_id here */
|
|
|
|
|| ace->a_type == GROUP_OBJ /* no need to check ace->a_id here */
|
|
|
|
|| ace->a_type == CLASS_OBJ
|
|
|
|
|| ace->a_type == OTHER_OBJ))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
# endif
|
|
|
|
|
|
|
|
#elif USE_ACL && (HAVE_ACLX_GET || HAVE_STATACL) /* AIX */
|
|
|
|
|
|
|
|
/* Return 1 if the given ACL is non-trivial.
|
|
|
|
Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */
|
|
|
|
int
|
|
|
|
acl_nontrivial (struct acl *a)
|
|
|
|
{
|
|
|
|
/* The normal way to iterate through an ACL is like this:
|
|
|
|
struct acl_entry *ace;
|
|
|
|
for (ace = a->acl_ext; ace != acl_last (a); ace = acl_nxt (ace))
|
|
|
|
{
|
|
|
|
struct ace_id *aei;
|
|
|
|
switch (ace->ace_type)
|
|
|
|
{
|
|
|
|
case ACC_PERMIT:
|
|
|
|
case ACC_DENY:
|
|
|
|
case ACC_SPECIFY:
|
|
|
|
...;
|
|
|
|
}
|
|
|
|
for (aei = ace->ace_id; aei != id_last (ace); aei = id_nxt (aei))
|
|
|
|
...
|
|
|
|
}
|
|
|
|
*/
|
|
|
|
return (acl_last (a) != a->acl_ext ? 1 : 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
# if HAVE_ACLX_GET && defined ACL_AIX_WIP /* newer AIX */
|
|
|
|
|
|
|
|
/* Return 1 if the given ACL is non-trivial.
|
|
|
|
Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */
|
|
|
|
int
|
|
|
|
acl_nfs4_nontrivial (nfs4_acl_int_t *a)
|
|
|
|
{
|
|
|
|
# if 1 /* let's try this first */
|
|
|
|
return (a->aclEntryN > 0 ? 1 : 0);
|
|
|
|
# else
|
|
|
|
int count = a->aclEntryN;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
{
|
|
|
|
nfs4_ace_int_t *ace = &a->aclEntry[i];
|
|
|
|
|
|
|
|
if (!((ace->flags & ACE4_ID_SPECIAL) != 0
|
|
|
|
&& (ace->aceWho.special_whoid == ACE4_WHO_OWNER
|
|
|
|
|| ace->aceWho.special_whoid == ACE4_WHO_GROUP
|
|
|
|
|| ace->aceWho.special_whoid == ACE4_WHO_EVERYONE)
|
|
|
|
&& ace->aceType == ACE4_ACCESS_ALLOWED_ACE_TYPE
|
|
|
|
&& ace->aceFlags == 0
|
|
|
|
&& (ace->aceMask & ~(ACE4_READ_DATA | ACE4_LIST_DIRECTORY
|
|
|
|
| ACE4_WRITE_DATA | ACE4_ADD_FILE
|
|
|
|
| ACE4_EXECUTE)) == 0))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
# endif
|
|
|
|
}
|
|
|
|
|
|
|
|
# endif
|
|
|
|
|
|
|
|
#elif USE_ACL && HAVE_ACLSORT /* NonStop Kernel */
|
|
|
|
|
|
|
|
/* Test an ACL retrieved with ACL_GET.
|
|
|
|
Return 1 if the given ACL, consisting of COUNT entries, is non-trivial.
|
|
|
|
Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */
|
|
|
|
int
|
|
|
|
acl_nontrivial (int count, struct acl *entries)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
{
|
|
|
|
struct acl *ace = &entries[i];
|
|
|
|
|
|
|
|
/* Note: If ace->a_type = USER_OBJ, ace->a_id is the st_uid from stat().
|
|
|
|
If ace->a_type = GROUP_OBJ, ace->a_id is the st_gid from stat().
|
|
|
|
We don't need to check ace->a_id in these cases. */
|
|
|
|
if (!(ace->a_type == USER_OBJ /* no need to check ace->a_id here */
|
|
|
|
|| ace->a_type == GROUP_OBJ /* no need to check ace->a_id here */
|
|
|
|
|| ace->a_type == CLASS_OBJ
|
|
|
|
|| ace->a_type == OTHER_OBJ))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
2015-05-28 00:46:15 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
free_permission_context (struct permission_context *ctx)
|
|
|
|
{
|
Merge from gnulib
This incorporates:
2016-01-24 openat_proc_name: fix last '/' overwritten on OS/2 kLIBC
2016-01-24 closedir, dirfd, opendir: port to OpenSolaris 5.10
2016-01-15 detect utimes() correctly on OS/2 kLIBC
2016-01-15 openat_proc_name: port to OS/2 kLIBC
2016-01-14 stdint: check _INTPTR_T_DECLARED for intptr_t etc.
2016-01-14 opendir, closedir, dirfd, fdopendir: port to OS/2 kLIBC
2016-01-14 dup, dup2, fcntl: support a directory fd on OS/2 kLIBC
2016-01-14 binary-io: don't put fd in binary mode if a console on EMX
2016-01-14 sig2str: list all signals on FreeBSD >= 7
2016-01-13 acl-permissions: port to USE_ACL==0 platforms
2016-01-12 mktime: rename macro to avoid glibc clash
2016-01-12 Port "$@" to OpenIndiana ksh93
2016-01-12 Port Universal Time settings to strict POSIX
* build-aux/gitlog-to-changelog, build-aux/update-copyright:
* doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h:
* lib/binary-io.h, lib/dirent.in.h, lib/dirfd.c, lib/dup2.c:
* lib/fcntl.c, lib/fdopendir.c, lib/mktime.c, lib/openat-proc.c:
* lib/sig2str.h, lib/stdint.in.h, m4/dirfd.m4, m4/dup2.m4:
* m4/fcntl.m4, m4/utimes.m4:
Copy from gnulib.
* m4/gnulib-comp.m4: Regenerate.
2016-01-24 22:50:47 +00:00
|
|
|
#if USE_ACL
|
Update from Gnulib
This incorporates:
2018-10-05 explicit_bzero: make it possible to namespace
2018-10-04 fcntl: make it possible to namespace
2018-10-01 mkostemp, mkostemps: fix C++ compilation on Mac OS X
2018-09-19 maint: mktime.c now shared with glibc
2018-09-18 file-has-acl: fix test failure on Cygwin 2.9
2018-09-18 gettime: nanotime never existed
* admin/merge-gnulib (AVOIDED_MODULES): Add mkdir.
* doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h:
* lib/acl_entries.c, lib/explicit_bzero.c, lib/fcntl.c:
* lib/get-permissions.c, lib/gettime.c, lib/mktime.c:
* lib/set-permissions.c, lib/stdlib.in.h, m4/acl.m4, m4/gettime.m4:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
2018-10-09 01:21:47 +00:00
|
|
|
# if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */
|
2015-05-28 00:46:15 +00:00
|
|
|
if (ctx->acl)
|
|
|
|
acl_free (ctx->acl);
|
|
|
|
# if !HAVE_ACL_TYPE_EXTENDED
|
|
|
|
if (ctx->default_acl)
|
|
|
|
acl_free (ctx->default_acl);
|
|
|
|
# endif
|
|
|
|
|
Update from Gnulib
This incorporates:
2018-10-05 explicit_bzero: make it possible to namespace
2018-10-04 fcntl: make it possible to namespace
2018-10-01 mkostemp, mkostemps: fix C++ compilation on Mac OS X
2018-09-19 maint: mktime.c now shared with glibc
2018-09-18 file-has-acl: fix test failure on Cygwin 2.9
2018-09-18 gettime: nanotime never existed
* admin/merge-gnulib (AVOIDED_MODULES): Add mkdir.
* doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h:
* lib/acl_entries.c, lib/explicit_bzero.c, lib/fcntl.c:
* lib/get-permissions.c, lib/gettime.c, lib/mktime.c:
* lib/set-permissions.c, lib/stdlib.in.h, m4/acl.m4, m4/gettime.m4:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
2018-10-09 01:21:47 +00:00
|
|
|
# elif defined GETACL /* Solaris, Cygwin < 2.5 */
|
2015-05-28 00:46:15 +00:00
|
|
|
free (ctx->entries);
|
|
|
|
# ifdef ACE_GETACL
|
|
|
|
free (ctx->ace_entries);
|
|
|
|
# endif
|
|
|
|
|
|
|
|
# elif HAVE_GETACL /* HP-UX */
|
|
|
|
|
|
|
|
# if HAVE_ACLV_H
|
|
|
|
# endif
|
|
|
|
|
|
|
|
# elif HAVE_STATACL /* older AIX */
|
|
|
|
|
|
|
|
# elif HAVE_ACLSORT /* NonStop Kernel */
|
|
|
|
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
}
|