Merge pull request #2168 from poettering/dnssec5

Fifth batch of DNSSEC support patches

diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c
index b3954e3223bd8963ee24594e028a195ae80983a2..286ddfef5b38024d201460469c90601dfa05d1ce 100644 (file)
--- a/src/basic/hashmap.c
+++ b/src/basic/hashmap.c
@@ -37,6 +37,7 @@
 #include "util.h"
 
 #ifdef ENABLE_DEBUG_HASHMAP
+#include <pthread.h>
 #include "list.h"
 #endif
 

diff --git a/units/systemd-journal-gatewayd.service.in b/units/systemd-journal-gatewayd.service.in
index 987220e554208dbf6a0a2eaa4b06d6453a7f8899..f4f845841da0f80a7c54447a764084b3c7d66d98 100644 (file)
--- a/units/systemd-journal-gatewayd.service.in
+++ b/units/systemd-journal-gatewayd.service.in
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Journal Gateway Service
+Documentation=man:systemd-journal-gatewayd(8)
 Requires=systemd-journal-gatewayd.socket
 
 [Service]

diff --git a/units/systemd-journal-gatewayd.socket b/units/systemd-journal-gatewayd.socket
index fd11058ab4ae5210b481c2a5a0a019b01a255a88..79d9b04210130cdb8e55759b00f2749d63d27d5d 100644 (file)
--- a/units/systemd-journal-gatewayd.socket
+++ b/units/systemd-journal-gatewayd.socket
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Journal Gateway Service Socket
+Documentation=man:systemd-journal-gatewayd(8)
 
 [Socket]
 ListenStream=19531

diff --git a/units/systemd-journal-remote.service.in b/units/systemd-journal-remote.service.in
index 2928a230211737402b4ffa830458b0a5fcf67a9d..fdf3da4b642ebfe9c4e4a43261e7411621fbfe00 100644 (file)
--- a/units/systemd-journal-remote.service.in
+++ b/units/systemd-journal-remote.service.in
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Journal Remote Sink Service
+Documentation=man:systemd-journal-remote(8) man:journal-remote.conf(5)
 Requires=systemd-journal-remote.socket
 
 [Service]

diff --git a/units/systemd-journal-upload.service.in b/units/systemd-journal-upload.service.in
index a757673a621b13504a5fa53089b21b9008f21830..4a89186f31dc5085929acce35f6b1ed744939e44 100644 (file)
--- a/units/systemd-journal-upload.service.in
+++ b/units/systemd-journal-upload.service.in
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Journal Remote Upload Service
+Documentation=man:systemd-journal-upload(8)
 After=network.target
 
 [Service]