put acl.la in 'if HAVE_ACL' and rename acl.[ch] to acl-util.[ch]
This commit is contained in:
parent
b30e2f4c18
commit
79c077224b
|
@ -629,12 +629,13 @@ libsystemd_audit_la_LIBADD = \
|
||||||
libsystemd-capability.la
|
libsystemd-capability.la
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
|
if HAVE_ACL
|
||||||
noinst_LTLIBRARIES += \
|
noinst_LTLIBRARIES += \
|
||||||
libsystemd-acl.la
|
libsystemd-acl.la
|
||||||
|
|
||||||
libsystemd_acl_la_SOURCES = \
|
libsystemd_acl_la_SOURCES = \
|
||||||
src/shared/acl.c \
|
src/shared/acl-util.c \
|
||||||
src/shared/acl.h
|
src/shared/acl-util.h
|
||||||
|
|
||||||
libsystemd_acl_la_CFLAGS = \
|
libsystemd_acl_la_CFLAGS = \
|
||||||
$(AM_CFLAGS) \
|
$(AM_CFLAGS) \
|
||||||
|
@ -642,6 +643,7 @@ libsystemd_acl_la_CFLAGS = \
|
||||||
|
|
||||||
libsystemd_acl_la_LIBADD = \
|
libsystemd_acl_la_LIBADD = \
|
||||||
$(ACL_LIBS)
|
$(ACL_LIBS)
|
||||||
|
endif
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
noinst_LTLIBRARIES += \
|
noinst_LTLIBRARIES += \
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
#ifdef HAVE_ACL
|
#ifdef HAVE_ACL
|
||||||
#include <sys/acl.h>
|
#include <sys/acl.h>
|
||||||
#include <acl/libacl.h>
|
#include <acl/libacl.h>
|
||||||
#include "acl.h"
|
#include "acl-util.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_SELINUX
|
#ifdef HAVE_SELINUX
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
#include "logind-acl.h"
|
#include "logind-acl.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "acl.h"
|
#include "acl-util.h"
|
||||||
|
|
||||||
static int flush_acl(acl_t acl) {
|
static int flush_acl(acl_t acl) {
|
||||||
acl_entry_t i;
|
acl_entry_t i;
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
#include "acl.h"
|
#include "acl-util.h"
|
||||||
|
|
||||||
int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) {
|
int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) {
|
||||||
acl_entry_t i;
|
acl_entry_t i;
|
Loading…
Reference in a new issue