Prep v234: Apply missing upstream fixes in src/libelogind (2/6)

diff --git a/src/libelogind/libelogind.sym b/src/libelogind/libelogind.sym
index a203f08c31ba20e2c17e5b791bc7a186679d7754..55f6a80bd4c9613f5366f19c81db101fc6db6365 100644 (file)
--- a/src/libelogind/libelogind.sym
+++ b/src/libelogind/libelogind.sym
@@ -477,16 +477,13 @@ global:
         sd_peer_get_cgroup;
 } LIBSYSTEMD_222;
 
-/*
- * These methods are not needed by elogind.
- * LIBSYSTEMD_227 {
- * global:
- *         sd_bus_default_flush_close;
- *         sd_bus_path_decode_many;
- *         sd_bus_path_encode_many;
- *         sd_listen_fds_with_names;
- * } LIBSYSTEMD_226;
-*/
+LIBSYSTEMD_227 {
+global:
+        /* sd_bus_default_flush_close; */
+        /* sd_bus_path_decode_many; */
+        /* sd_bus_path_encode_many; */
+        sd_listen_fds_with_names;
+} LIBSYSTEMD_226;
 
 /*
  * These methods are not needed by elogind.
@@ -511,7 +508,7 @@ global:
 LIBSYSTEMD_231 {
 global:
         sd_event_get_iteration;
-} LIBSYSTEMD_226;
+} LIBSYSTEMD_227;
 
 LIBSYSTEMD_232 {
 global:

diff --git a/src/libelogind/sd-daemon/sd-daemon.c b/src/libelogind/sd-daemon/sd-daemon.c
index 26a0a7e522eee21e31750bcf7f55788e3b5ab86f..e5830245814005e05b235360454183d02b5178e5 100644 (file)
--- a/src/libelogind/sd-daemon/sd-daemon.c
+++ b/src/libelogind/sd-daemon/sd-daemon.c
@@ -44,7 +44,6 @@
 
 #define SNDBUF_SIZE (8*1024*1024)
 
-#if 0 /// UNNEEDED by elogind
 static void unsetenv_all(bool unset_environment) {
 
         if (!unset_environment)
@@ -146,6 +145,7 @@ _public_ int sd_listen_fds_with_names(int unset_environment, char ***names) {
         return n_fds;
 }
 
+#if 0 /// UNNEEDED by elogind
 _public_ int sd_is_fifo(int fd, const char *path) {
         struct stat st_fd;