From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 31 Dec 2020 19:48:44 +0000 (+0900)
Subject: login: move src/login/logind-acl.[ch] -> src/shared/devnode-acl.[ch]
X-Git-Tag: v248-rc1~304^2~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f46548deb5d409a516c83c40f75e5c0edff1e3e;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 10cc7d960bd..b70afea62e5 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -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"
diff --git a/src/login/meson.build b/src/login/meson.build
index 9c7545790c6..22f9ce18d53 100644
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -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,
diff --git a/src/login/logind-acl.c b/src/shared/devnode-acl.c
similarity index 99%
rename from src/login/logind-acl.c
rename to src/shared/devnode-acl.c
index ed615e23f81..07e29e10191 100644
--- a/src/login/logind-acl.c
+++ b/src/shared/devnode-acl.c
@@ -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"
diff --git a/src/login/logind-acl.h b/src/shared/devnode-acl.h
similarity index 100%
rename from src/login/logind-acl.h
rename to src/shared/devnode-acl.h
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 5a8f0ae3a5f..3032a9efd1a 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -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
diff --git a/src/udev/meson.build b/src/udev/meson.build
index 9ec14c80218..00e7329361e 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -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
 
 ############################################################
diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c
index cfdf130f127..3fdbb88bc4f 100644
--- a/src/udev/udev-builtin-uaccess.c
+++ b/src/udev/udev-builtin-uaccess.c
@@ -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"