Merge pull request #251 from zonque/signal

core: execute: fix regression in pam_setup()

diff --git a/CODING_STYLE b/CODING_STYLE
index bdec988ce6bdbca0f9155bb57cb28577b2190a6c..dbadfbdb5441adf3ae53a0ebec458bf2726cd151 100644 (file)
--- a/CODING_STYLE
+++ b/CODING_STYLE
@@ -210,11 +210,12 @@
   c) recvmsg() must get MSG_CMSG_CLOEXEC set
   d) F_DUPFD_CLOEXEC should be used instead of F_DUPFD, and so on
 
-- We never use the XDG version of basename(). glibc defines it in
-  libgen.h. The only reason to include that file is because dirname()
+- We never use the POSIX version of basename() (which glibc defines it in
+  libgen.h), only the GNU version (which glibc defines in string.h).
+  The only reason to include libgen.h is because dirname()
   is needed. Everytime you need that please immediately undefine
   basename(), and add a comment about it, so that no code ever ends up
-  using the XDG version!
+  using the POSIX version!
 
 - Use the bool type for booleans, not integers. One exception: in public
   headers (i.e those in src/systemd/sd-*.h) use integers after all, as "bool"

diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index 8a193d5a59e8d43c977dba525caa34e8acfe1ae2..b9e081101b2a4be7ed7c31d80d017be6ba2b283d 100644 (file)
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_creds_get_pid" conditional="ENABLE_KDBUS">
+<refentry id="sd_bus_creds_get_pid">
 
   <refentryinfo>
     <title>sd_bus_creds_get_pid</title>

diff --git a/man/sd_bus_creds_new_from_pid.xml b/man/sd_bus_creds_new_from_pid.xml
index 695d4e1f5a52ce803ccafa4e0e423d46c5341ea6..36b6bef04e5a4d034702725201e2d28346e1576d 100644 (file)
--- a/man/sd_bus_creds_new_from_pid.xml
+++ b/man/sd_bus_creds_new_from_pid.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_creds_new_from_pid" conditional="ENABLE_KDBUS">
+<refentry id="sd_bus_creds_new_from_pid">
 
   <refentryinfo>
     <title>sd_bus_creds_new_from_pid</title>

diff --git a/man/sd_bus_default.xml b/man/sd_bus_default.xml
index 55f1b8bb6906b8b55a2335fe917b1e10c1769188..ae0b1a05c862ec53315e1f9c379871a832609c48 100644 (file)
--- a/man/sd_bus_default.xml
+++ b/man/sd_bus_default.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_default" conditional="ENABLE_KDBUS">
+<refentry id="sd_bus_default">
 
   <refentryinfo>
     <title>sd_bus_default</title>

diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index bd2a27984c24d6ed6b32ebe43de78fb899a3b0ff..762f0c0d6da5320ed972853ad41b1728a62b76b8 100644 (file)
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_error" conditional="ENABLE_KDBUS">
+<refentry id="sd_bus_error">
 
   <refentryinfo>
     <title>sd_bus_error</title>

diff --git a/man/sd_bus_message_append.xml b/man/sd_bus_message_append.xml
index 91a80792e1ff3562657e1507d649c9d0d4fb90cd..5025bdfefbcdfdf13a25c9f97e40285992e5fa09 100644 (file)
--- a/man/sd_bus_message_append.xml
+++ b/man/sd_bus_message_append.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_message_append" conditional="ENABLE_KDBUS"
+<refentry id="sd_bus_message_append"
           xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>

diff --git a/man/sd_bus_message_append_array.xml b/man/sd_bus_message_append_array.xml
index 54098933746e09629c5a0a108788d0f326dbda47..fc5ee2392b273c09b489d6f3044db26c84ed17db 100644 (file)
--- a/man/sd_bus_message_append_array.xml
+++ b/man/sd_bus_message_append_array.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_message_append_array" conditional="ENABLE_KDBUS"
+<refentry id="sd_bus_message_append_array"
           xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>

diff --git a/man/sd_bus_message_append_basic.xml b/man/sd_bus_message_append_basic.xml
index 81ac6de95233d0d5faf7250c90097d4e1fd49529..82c6957122de51990fb5febbd5525b9b4fcecd1a 100644 (file)
--- a/man/sd_bus_message_append_basic.xml
+++ b/man/sd_bus_message_append_basic.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_message_append_basic" conditional="ENABLE_KDBUS">
+<refentry id="sd_bus_message_append_basic">
 
   <refentryinfo>
     <title>sd_bus_message_append_basic</title>

diff --git a/man/sd_bus_message_append_string_memfd.xml b/man/sd_bus_message_append_string_memfd.xml
index 1fecbd577314e2074912b0de735e0aba5baa9c63..61c513ad75e2fd7f868734cb1de0488246275efb 100644 (file)
--- a/man/sd_bus_message_append_string_memfd.xml
+++ b/man/sd_bus_message_append_string_memfd.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_message_append_string_memfd" conditional="ENABLE_KDBUS"
+<refentry id="sd_bus_message_append_string_memfd"
           xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>

diff --git a/man/sd_bus_message_append_strv.xml b/man/sd_bus_message_append_strv.xml
index d986b06a41866b86067f82ddeb8b04a6412b2ce5..57a6864acefccc066fabd6672af96dcee97fa54e 100644 (file)
--- a/man/sd_bus_message_append_strv.xml
+++ b/man/sd_bus_message_append_strv.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_message_append_strv" conditional="ENABLE_KDBUS"
+<refentry id="sd_bus_message_append_strv"
           xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>

diff --git a/man/sd_bus_message_get_cookie.xml b/man/sd_bus_message_get_cookie.xml
index 7795acfec33dffa44e56e5e07a220e94fb16af18..7f762a34f7ee1fabbc76eec05eb2759e8ec26435 100644 (file)
--- a/man/sd_bus_message_get_cookie.xml
+++ b/man/sd_bus_message_get_cookie.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_message_get_cookie" conditional="ENABLE_KDBUS">
+<refentry id="sd_bus_message_get_cookie">
 
   <refentryinfo>
     <title>sd_bus_message_get_cookie</title>

diff --git a/man/sd_bus_message_get_monotonic_usec.xml b/man/sd_bus_message_get_monotonic_usec.xml
index c109fe10a3fb10f3fa44b67ffec8f8dd6c54550d..c8deecffbbb35dee5baab4de2d1318f97ed062b7 100644 (file)
--- a/man/sd_bus_message_get_monotonic_usec.xml
+++ b/man/sd_bus_message_get_monotonic_usec.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_message_get_monotonic_usec" conditional="ENABLE_KDBUS">
+<refentry id="sd_bus_message_get_monotonic_usec">
 
   <refentryinfo>
     <title>sd_bus_message_get_monotonic_usec</title>

diff --git a/man/sd_bus_negotiate_fds.xml b/man/sd_bus_negotiate_fds.xml
index 4f9204e7bceee592a9bbb4e2d94144e9aaa9831f..d31cb57e5f447bd4689b78e08738e02d9b3e0ff8 100644 (file)
--- a/man/sd_bus_negotiate_fds.xml
+++ b/man/sd_bus_negotiate_fds.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_negotiate_fds" conditional="ENABLE_KDBUS">
+<refentry id="sd_bus_negotiate_fds">
 
   <refentryinfo>
     <title>sd_bus_negotiate_fds</title>

diff --git a/man/sd_bus_new.xml b/man/sd_bus_new.xml
index bc91dd2665f3ec1bce11080786dd0144ac1046ba..c1d82bbe5347bb219fc6c1abc2b5624d394f901b 100644 (file)
--- a/man/sd_bus_new.xml
+++ b/man/sd_bus_new.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_new" conditional="ENABLE_KDBUS">
+<refentry id="sd_bus_new">
 
   <refentryinfo>
     <title>sd_bus_new</title>

diff --git a/man/sd_bus_path_encode.xml b/man/sd_bus_path_encode.xml
index 0a6ac8047329b6b118dc7201e5746accdaef71b9..41c35bde02262955bd0d366ff18c9faf4c7c094c 100644 (file)
--- a/man/sd_bus_path_encode.xml
+++ b/man/sd_bus_path_encode.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_path_encode" conditional="ENABLE_KDBUS">
+<refentry id="sd_bus_path_encode">
 
   <refentryinfo>
     <title>sd_bus_path_encode</title>

diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml
index 78b440b7db5246963ff0072484d817a6d4b1519b..a7dc9fea89cb7dde1ed3fa814aee0db7cc40d8bb 100644 (file)
--- a/man/sd_bus_request_name.xml
+++ b/man/sd_bus_request_name.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_request_name" conditional="ENABLE_KDBUS">
+<refentry id="sd_bus_request_name">
 
   <refentryinfo>
     <title>sd_bus_request_name</title>

diff --git a/man/sd_event_add_child.xml b/man/sd_event_add_child.xml
index 7de9f409e9e220046f8d008529b375f7c64d35e9..6b53c8422bfb3f2d3fbd4070942f73f187559596 100644 (file)
--- a/man/sd_event_add_child.xml
+++ b/man/sd_event_add_child.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_event_add_child" conditional="ENABLE_KDBUS">
+<refentry id="sd_event_add_child">
 
   <refentryinfo>
     <title>sd_event_add_child</title>

diff --git a/man/sd_event_add_defer.xml b/man/sd_event_add_defer.xml
index 4aabc0793a0cb07014959367e83c953d6502ada4..b991b38650f048d0b1a7f29e1a1b65302de70ead 100644 (file)
--- a/man/sd_event_add_defer.xml
+++ b/man/sd_event_add_defer.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_event_add_defer" conditional="ENABLE_KDBUS">
+<refentry id="sd_event_add_defer">
 
   <refentryinfo>
     <title>sd_event_add_defer</title>

diff --git a/man/sd_event_add_signal.xml b/man/sd_event_add_signal.xml
index e84d5c7200609bcbbbc05948aa457d6e26d67003..16414803f4160e117a3465d81a995a0d23ba9db7 100644 (file)
--- a/man/sd_event_add_signal.xml
+++ b/man/sd_event_add_signal.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_event_add_signal" conditional="ENABLE_KDBUS">
+<refentry id="sd_event_add_signal">
 
   <refentryinfo>
     <title>sd_event_add_signal</title>

diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index 3c5de48cabe7fcd5a136c613510784aff61400a0..5fc917270c29bb08c3d52837924f12de6bf9ccc2 100644 (file)
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_event_add_time" conditional="ENABLE_KDBUS">
+<refentry id="sd_event_add_time">
 
   <refentryinfo>
     <title>sd_event_add_time</title>

diff --git a/man/sd_event_get_fd.xml b/man/sd_event_get_fd.xml
index 8f74c1e5c4fa22e2c3fc2448c47c350059fa7b03..1e46665e47048b6d234ac81013865fef623c145a 100644 (file)
--- a/man/sd_event_get_fd.xml
+++ b/man/sd_event_get_fd.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_event_get_fd" conditional="ENABLE_KDBUS"
+<refentry id="sd_event_get_fd"
         xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>

diff --git a/man/sd_event_new.xml b/man/sd_event_new.xml
index d2253300230104860fe1ef682baeddfd383bda69..43b5b742f73b9b4fc805cc2f20a56d7a0445924b 100644 (file)
--- a/man/sd_event_new.xml
+++ b/man/sd_event_new.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_event_new" conditional="ENABLE_KDBUS">
+<refentry id="sd_event_new">
 
   <refentryinfo>
     <title>sd_event_new</title>

diff --git a/man/sd_event_run.xml b/man/sd_event_run.xml
index 036887d9f0ecae25f8e288d5ed50ee6ea879b918..9b50b95459cb1198cec31cd780948a645852d4fb 100644 (file)
--- a/man/sd_event_run.xml
+++ b/man/sd_event_run.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_event_run" conditional="ENABLE_KDBUS">
+<refentry id="sd_event_run">
 
   <refentryinfo>
     <title>sd_event_run</title>

diff --git a/man/sd_event_set_name.xml b/man/sd_event_set_name.xml
index 0b46414bba55facaedbe6ecd762deb01d07cb537..eec34d1182f433d1e78ea4ee9342205484a78ed7 100644 (file)
--- a/man/sd_event_set_name.xml
+++ b/man/sd_event_set_name.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_event_set_name" conditional="ENABLE_KDBUS"
+<refentry id="sd_event_set_name"
         xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>

diff --git a/man/sd_event_wait.xml b/man/sd_event_wait.xml
index db74a96e8ec58d09ed73c0caca022e49a70f6b33..94f8b5ca457edd9e01388df5a9f5dddc43dabd8a 100644 (file)
--- a/man/sd_event_wait.xml
+++ b/man/sd_event_wait.xml
@@ -24,7 +24,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_event_wait" conditional="ENABLE_KDBUS">
+<refentry id="sd_event_wait">
 
   <refentryinfo>
     <title>sd_event_wait</title>

diff --git a/src/basic/util.c b/src/basic/util.c
index b7c70af5414001ae2f8cb6e6d429b4946b055e69..e0c5069ff8c2b22ee5e8bc973aed067f2bb2363b 100644 (file)
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -60,8 +60,8 @@
 #include <linux/fs.h>
 
 /* When we include libgen.h because we need dirname() we immediately
- * undefine basename() since libgen.h defines it as a macro to the XDG
- * version which is really broken. */
+ * undefine basename() since libgen.h defines it as a macro to the POSIX
+ * version which is really broken. We prefer GNU basename(). */
 #include <libgen.h>
 #undef basename
 

diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index 3aaaabf4edb27f4388a6d5d3d7d08ee5998f5234..f08db2da893c25d13f4986b4b50cbe9f38ade677 100644 (file)
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -29,8 +29,8 @@
 #include <sys/prctl.h>
 
 /* When we include libgen.h because we need dirname() we immediately
- * undefine basename() since libgen.h defines it as a macro to the XDG
- * version which is really broken. */
+ * undefine basename() since libgen.h defines it as a macro to the POSIX
+ * version which is really broken. We prefer GNU basename(). */
 #include <libgen.h>
 #undef basename
 

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 0892479a9aa7a137f4d9fbd6bacb3bafaf3f5ae1..9f026beb1325ca99c171fb3465c94b787dffc0bf 100644 (file)
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -24,8 +24,8 @@
 #include <sys/mount.h>
 
 /* When we include libgen.h because we need dirname() we immediately
- * undefine basename() since libgen.h defines it as a macro to the XDG
- * version which is really broken. */
+ * undefine basename() since libgen.h defines it as a macro to the POSIX
+ * version which is really broken. We prefer GNU basename(). */
 #include <libgen.h>
 #undef basename