From: Sven Eden <yamakuzure@gmx.net>
Date: Wed, 5 Jul 2017 08:30:23 +0000 (+0200)
Subject: Prep v232.2: Unmask sd_id128_get_invocation(), it is part of the API installed by... 
X-Git-Tag: v232.2~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=20d9767d610b86432b3e6893d208604f384c41ca

Prep v232.2: Unmask sd_id128_get_invocation(), it is part of the API installed by elogind, and therefore must not be masked.
---

diff --git a/src/libelogind/libelogind.sym b/src/libelogind/libelogind.sym
index 4d9623cbb..179c07a63 100644
--- a/src/libelogind/libelogind.sym
+++ b/src/libelogind/libelogind.sym
@@ -521,5 +521,5 @@ global:
         /* sd_bus_track_count_sender; */
         sd_bus_set_exit_on_disconnect;
         /* sd_bus_get_exit_on_disconnect; */
-        /* sd_id128_get_invocation; */
+        sd_id128_get_invocation;
 } LIBELOGIND_231;
diff --git a/src/libelogind/sd-id128/sd-id128.c b/src/libelogind/sd-id128/sd-id128.c
index e51efb4dd..d4450c70a 100644
--- a/src/libelogind/sd-id128/sd-id128.c
+++ b/src/libelogind/sd-id128/sd-id128.c
@@ -129,7 +129,6 @@ _public_ int sd_id128_get_boot(sd_id128_t *ret) {
         return 0;
 }
 
-#if 0 /// UNNEEDED by elogind
 _public_ int sd_id128_get_invocation(sd_id128_t *ret) {
         static thread_local sd_id128_t saved_invocation_id = {};
         int r;
@@ -151,7 +150,6 @@ _public_ int sd_id128_get_invocation(sd_id128_t *ret) {
         *ret = saved_invocation_id;
         return 0;
 }
-#endif // 0
 
 static sd_id128_t make_v4_uuid(sd_id128_t id) {
         /* Stolen from generate_random_uuid() of drivers/char/random.c
diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h
index 1977e62e9..ee011b186 100644
--- a/src/systemd/sd-id128.h
+++ b/src/systemd/sd-id128.h
@@ -46,9 +46,7 @@ int sd_id128_randomize(sd_id128_t *ret);
 
 int sd_id128_get_machine(sd_id128_t *ret);
 int sd_id128_get_boot(sd_id128_t *ret);
-#if 0 /// UNNEEDED by elogind
 int sd_id128_get_invocation(sd_id128_t *ret);
-#endif // 0
 
 #define SD_ID128_MAKE(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) \
         ((const sd_id128_t) { .bytes = { 0x##v0, 0x##v1, 0x##v2, 0x##v3, 0x##v4, 0x##v5, 0x##v6, 0x##v7, \