mirror of
https://github.com/systemd/systemd.git
synced 2025-02-09 13:57:42 +03:00
login: move src/login/logind-acl.[ch] -> src/shared/devnode-acl.[ch]
The files are used by logind and udevd. And the functions in the files are not specific to logind, and quite general enough to move to libshared.
This commit is contained in:
parent
100fd93f55
commit
0f46548deb
@ -8,11 +8,11 @@
|
||||
#include "sd-messages.h"
|
||||
|
||||
#include "alloc-util.h"
|
||||
#include "devnode-acl.h"
|
||||
#include "errno-util.h"
|
||||
#include "fd-util.h"
|
||||
#include "fileio.h"
|
||||
#include "format-util.h"
|
||||
#include "logind-acl.h"
|
||||
#include "logind-seat-dbus.h"
|
||||
#include "logind-seat.h"
|
||||
#include "logind-session-dbus.h"
|
||||
|
@ -12,7 +12,6 @@ logind_gperf_c = custom_target(
|
||||
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
|
||||
|
||||
liblogind_core_sources = files('''
|
||||
logind-acl.h
|
||||
logind-action.c
|
||||
logind-action.h
|
||||
logind-brightness.c
|
||||
@ -45,11 +44,6 @@ liblogind_core_sources = files('''
|
||||
|
||||
liblogind_core_sources += [logind_gperf_c]
|
||||
|
||||
logind_acl_c = files('logind-acl.c')
|
||||
if conf.get('HAVE_ACL') == 1
|
||||
liblogind_core_sources += logind_acl_c
|
||||
endif
|
||||
|
||||
liblogind_core = static_library(
|
||||
'logind-core',
|
||||
liblogind_core_sources,
|
||||
|
@ -7,11 +7,11 @@
|
||||
#include "acl-util.h"
|
||||
#include "alloc-util.h"
|
||||
#include "device-util.h"
|
||||
#include "devnode-acl.h"
|
||||
#include "dirent-util.h"
|
||||
#include "escape.h"
|
||||
#include "fd-util.h"
|
||||
#include "format-util.h"
|
||||
#include "logind-acl.h"
|
||||
#include "set.h"
|
||||
#include "string-util.h"
|
||||
#include "util.h"
|
@ -78,6 +78,7 @@ shared_sources = files('''
|
||||
daemon-util.h
|
||||
dev-setup.c
|
||||
dev-setup.h
|
||||
devnode-acl.h
|
||||
dissect-image.c
|
||||
dissect-image.h
|
||||
dm-util.c
|
||||
@ -290,7 +291,10 @@ syscall_list_h = custom_target(
|
||||
capture : true)
|
||||
|
||||
if conf.get('HAVE_ACL') == 1
|
||||
shared_sources += files('acl-util.c')
|
||||
shared_sources += files('''
|
||||
acl-util.c
|
||||
devnode-acl.c
|
||||
'''.split())
|
||||
endif
|
||||
|
||||
if conf.get('ENABLE_UTMP') == 1
|
||||
|
@ -50,9 +50,7 @@ if conf.get('HAVE_BLKID') == 1
|
||||
endif
|
||||
|
||||
if conf.get('HAVE_ACL') == 1
|
||||
libudevd_core_sources += ['udev-builtin-uaccess.c',
|
||||
logind_acl_c,
|
||||
sd_login_sources]
|
||||
libudevd_core_sources += ['udev-builtin-uaccess.c']
|
||||
endif
|
||||
|
||||
############################################################
|
||||
|
@ -11,8 +11,8 @@
|
||||
#include "sd-login.h"
|
||||
|
||||
#include "device-util.h"
|
||||
#include "devnode-acl.h"
|
||||
#include "login-util.h"
|
||||
#include "logind-acl.h"
|
||||
#include "log.h"
|
||||
#include "udev-builtin.h"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user