diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-04-11 16:39:31 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-04-11 16:47:09 +0200 |
| commit | 79c077224be5a868d0bba66972ef9546dae85977 (patch) | |
| tree | 19ca00d028ebfcbb6e67f00458f14a047410c51f | |
| parent | b30e2f4c18ad81b04e4314fd191a5d458553773c (diff) | |
put acl.la in 'if HAVE_ACL' and rename acl.[ch] to acl-util.[ch]
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | src/journal/journald.c | 2 | ||||
| -rw-r--r-- | src/login/logind-acl.c | 2 | ||||
| -rw-r--r-- | src/shared/acl-util.c (renamed from src/shared/acl.c) | 2 | ||||
| -rw-r--r-- | src/shared/acl-util.h (renamed from src/shared/acl.h) | 0 |
5 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 4ed1f12dcc..493e15e7c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -629,12 +629,13 @@ libsystemd_audit_la_LIBADD = \ libsystemd-capability.la # ------------------------------------------------------------------------------ +if HAVE_ACL noinst_LTLIBRARIES += \ libsystemd-acl.la libsystemd_acl_la_SOURCES = \ - src/shared/acl.c \ - src/shared/acl.h + src/shared/acl-util.c \ + src/shared/acl-util.h libsystemd_acl_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -642,6 +643,7 @@ libsystemd_acl_la_CFLAGS = \ libsystemd_acl_la_LIBADD = \ $(ACL_LIBS) +endif # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ diff --git a/src/journal/journald.c b/src/journal/journald.c index 073bb890ab..ea23cff26e 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -51,7 +51,7 @@ #ifdef HAVE_ACL #include <sys/acl.h> #include <acl/libacl.h> -#include "acl.h" +#include "acl-util.h" #endif #ifdef HAVE_SELINUX diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c index e2e8696cda..eb8a48d191 100644 --- a/src/login/logind-acl.c +++ b/src/login/logind-acl.c @@ -27,7 +27,7 @@ #include "logind-acl.h" #include "util.h" -#include "acl.h" +#include "acl-util.h" static int flush_acl(acl_t acl) { acl_entry_t i; diff --git a/src/shared/acl.c b/src/shared/acl-util.c index d6a80f44ae..a2a9f9a22b 100644 --- a/src/shared/acl.c +++ b/src/shared/acl-util.c @@ -25,7 +25,7 @@ #include <errno.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) { acl_entry_t i; diff --git a/src/shared/acl.h b/src/shared/acl-util.h index 798ce43364..798ce43364 100644 --- a/src/shared/acl.h +++ b/src/shared/acl-util.h |