dlopen-note: downgrade all dlopen notes in libsystemd.so and libsystemd-shared.so

Since all executables now manage their required dlopen notes directly
within their own source code with explicit priority levels, it is no
longer necessary to declare high-priority dlopen notes in the shared
libraries themselves.

diff --git a/src/basic/compress.c b/src/basic/compress.c
index 2bc11f48bc230e496d550e69443ebf1d8bdb2a23..0f62fb95f55905f5565542fa0f873afca62c2c6b 100644 (file)
--- a/src/basic/compress.c
+++ b/src/basic/compress.c
@@ -304,7 +304,7 @@ int dlopen_xz(int log_level) {
 #if HAVE_XZ
         static void *lzma_dl = NULL;
 
-        LIBLZMA_NOTE(COMPRESSION_PRIORITY_XZ);
+        LIBLZMA_NOTE(suggested);
 
         return dlopen_many_sym_or_warn(
                         &lzma_dl,
@@ -325,7 +325,7 @@ int dlopen_lz4(int log_level) {
 #if HAVE_LZ4
         static void *lz4_dl = NULL;
 
-        LIBLZ4_NOTE(COMPRESSION_PRIORITY_LZ4);
+        LIBLZ4_NOTE(suggested);
 
         return dlopen_many_sym_or_warn(
                         &lz4_dl,
@@ -355,7 +355,7 @@ int dlopen_zstd(int log_level) {
 #if HAVE_ZSTD
         static void *zstd_dl = NULL;
 
-        LIBZSTD_NOTE(COMPRESSION_PRIORITY_ZSTD);
+        LIBZSTD_NOTE(suggested);
 
         return dlopen_many_sym_or_warn(
                         &zstd_dl,

diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index 68457e1636756b4002401f2fab87adefe0cee67f..d5914a7c8f41bdf80aa5dfbd092135c38c691fcb 100644 (file)
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -47,7 +47,7 @@ int dlopen_libacl(int log_level) {
 #if HAVE_ACL
         static void *libacl_dl = NULL;
 
-        LIBACL_NOTE(recommended);
+        LIBACL_NOTE(suggested);
 
         return dlopen_many_sym_or_warn(
                         &libacl_dl,

diff --git a/src/shared/apparmor-util.c b/src/shared/apparmor-util.c
index dce21d1e69b5362456b080760da4163e7b436e8d..c8da5f892ba792c80cf360e07970b94589c2c204 100644 (file)
--- a/src/shared/apparmor-util.c
+++ b/src/shared/apparmor-util.c
@@ -46,7 +46,7 @@ int dlopen_libapparmor(int log_level) {
 #if HAVE_APPARMOR
         static void *libapparmor_dl = NULL;
 
-        LIBAPPARMOR_NOTE(recommended);
+        LIBAPPARMOR_NOTE(suggested);
 
         return dlopen_many_sym_or_warn(
                         &libapparmor_dl,

diff --git a/src/shared/blkid-util.c b/src/shared/blkid-util.c
index 98648917f1289b09165535b0b858e8ce04b0b009..0bb3bd785acbbe15fa0f51ea549adfac6db4513e 100644 (file)
--- a/src/shared/blkid-util.c
+++ b/src/shared/blkid-util.c
@@ -98,7 +98,7 @@ int dlopen_libblkid(int log_level) {
 #if HAVE_BLKID
         static void *libblkid_dl = NULL;
 
-        LIBBLKID_NOTE(recommended);
+        LIBBLKID_NOTE(suggested);
 
         return dlopen_many_sym_or_warn(
                         &libblkid_dl,

diff --git a/src/shared/libaudit-util.c b/src/shared/libaudit-util.c
index 1a1975e8038e60df85dce4db09a7095887e833e7..3cc995a57b14991a6e2de227844ccc98a64e3181 100644 (file)
--- a/src/shared/libaudit-util.c
+++ b/src/shared/libaudit-util.c
@@ -23,7 +23,7 @@ int dlopen_libaudit(int log_level) {
 #if HAVE_AUDIT
         static void *libaudit_dl = NULL;
 
-        LIBAUDIT_NOTE(recommended);
+        LIBAUDIT_NOTE(suggested);
 
         return dlopen_many_sym_or_warn(
                         &libaudit_dl,

diff --git a/src/shared/libcrypt-util.c b/src/shared/libcrypt-util.c
index 17a2ad746bae2625efae8c5003c77bb18209c725..fcf36d15fa4c7998d394c6e70d5a107271c1d918 100644 (file)
--- a/src/shared/libcrypt-util.c
+++ b/src/shared/libcrypt-util.c
@@ -142,7 +142,7 @@ int dlopen_libcrypt(int log_level) {
         if (cached < 0)
                 return cached; /* Already tried, and failed. */
 
-        LIBCRYPT_NOTE(recommended);
+        LIBCRYPT_NOTE(suggested);
 
         /* Several distributions like Debian/Ubuntu and OpenSUSE provide libxcrypt as libcrypt.so.1
          * (libcrypt.so.1.1 on some architectures), while others like Fedora/CentOS and Arch provide it as

diff --git a/src/shared/libmount-util.c b/src/shared/libmount-util.c
index 39fef6974d641f4a2d26b552dbc76cf06565a2a5..ad81957df7cba5b66caef282af4da306cd18323c 100644 (file)
--- a/src/shared/libmount-util.c
+++ b/src/shared/libmount-util.c
@@ -118,7 +118,7 @@ int dlopen_libmount(int log_level) {
 #if HAVE_LIBMOUNT
         static void *libmount_dl = NULL;
 
-        LIBMOUNT_NOTE(recommended);
+        LIBMOUNT_NOTE(suggested);
 
         return dlopen_many_sym_or_warn(
                         &libmount_dl,

diff --git a/src/shared/module-util.c b/src/shared/module-util.c
index 33704449d9a2244e68b032983b967ea7a26406c3..1eb7404be2e42013cdc6568ceaab8a2eda1ada8b 100644 (file)
--- a/src/shared/module-util.c
+++ b/src/shared/module-util.c
@@ -171,7 +171,7 @@ int dlopen_libkmod(int log_level) {
 #if HAVE_KMOD
         static void *libkmod_dl = NULL;
 
-        LIBKMOD_NOTE(recommended);
+        LIBKMOD_NOTE(suggested);
 
         return dlopen_many_sym_or_warn(
                         &libkmod_dl,

diff --git a/src/shared/pam-util.c b/src/shared/pam-util.c
index 8d3a7b8d3ecc7c6fba72e99c7bd3d8f844c58848..65ff84be56826112a2f5530285a022ad31a4057c 100644 (file)
--- a/src/shared/pam-util.c
+++ b/src/shared/pam-util.c
@@ -382,7 +382,7 @@ int dlopen_libpam(int log_level) {
 #if HAVE_PAM
         static void *libpam_dl = NULL;
 
-        LIBPAM_NOTE(recommended);
+        LIBPAM_NOTE(suggested);
 
         return dlopen_many_sym_or_warn(
                         &libpam_dl,

diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c
index cf65e1ca0ed26b159fff6d74a5f0a0b513da1074..f02280e454961ce1c009e60e24d0f6f6f2e6e9fd 100644 (file)
--- a/src/shared/seccomp-util.c
+++ b/src/shared/seccomp-util.c
@@ -2601,7 +2601,7 @@ int dlopen_libseccomp(int log_level) {
 #if HAVE_SECCOMP
         static void *libseccomp_dl = NULL;
 
-        LIBSECCOMP_NOTE(recommended);
+        LIBSECCOMP_NOTE(suggested);
 
         return dlopen_many_sym_or_warn(
                         &libseccomp_dl,

diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c
index ec10b5b846a77d1cef4e824feb94beb2389b509f..15d9f2fddb2adbf2abe6058e85e67b20515a2117 100644 (file)
--- a/src/shared/selinux-util.c
+++ b/src/shared/selinux-util.c
@@ -92,7 +92,7 @@ int dlopen_libselinux(int log_level) {
 #if HAVE_SELINUX
         static void *libselinux_dl = NULL;
 
-        LIBSELINUX_NOTE(recommended);
+        LIBSELINUX_NOTE(suggested);
 
         return dlopen_many_sym_or_warn(
                         &libselinux_dl,