dhcp: cleanup internal systemd dhcp library

Merge first part of patches that prepare for updating
the dhcp library to new systemd upstream.

https://bugzilla.gnome.org/show_bug.cgi?id=742719

45 files changed, 100 insertions, 78 deletions

diff --git a/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h b/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h
index ce1716b175..a95f5bfb42 100644
--- a/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h
+++ b/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h
@@ -57,7 +57,7 @@ G_STMT_START { \
 	if (nm_logging_enabled (_l, LOGD_DHCP)) { \
 		const char *_location = strrchr (file "", '/'); \
 		\
-		_nm_log (_location ? _location + 1 : file, line, func, _l, LOGD_DHCP, format, ## __VA_ARGS__); \
+		_nm_log (_location ? _location + 1 : file, line, func, _l, LOGD_DHCP, 0, format, ## __VA_ARGS__); \
 	} \
 } G_STMT_END
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h
index 9e184ac4b5..2d7bf03bab 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h
@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <stdint.h>
 #include <linux/if_packet.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c
index 971b3aa180..26e6e9f3df 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c
@@ -17,8 +17,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "config.h"
-
 #include "nm-sd-adapt.h"
 
 #include <errno.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c
index 9759e575a2..50ecf87383 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c
@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "config.h"
-
 #include "nm-sd-adapt.h"
 
 #include <stdint.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c
index 5bb065ba1c..e6ebf86ae1 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c
@@ -18,8 +18,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "config.h"
-
 #include "nm-sd-adapt.h"
 
 #include <stdlib.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h
index abca9422c5..da483feadf 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/udp.h>
 #include <netinet/ip.h>
 #include <stdint.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c
index fbb20ef94b..626a4d6a7f 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c
@@ -17,8 +17,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "config.h"
-
 #include "nm-sd-adapt.h"
 
 #include <errno.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c
index 3d6e24623a..10872a3159 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c
@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "config.h"
-
 #include "nm-sd-adapt.h"
 
 #include <netinet/in.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h
index eaa671711f..e46470d20e 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/ip6.h>
 #include <netinet/udp.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c
index b9334bd657..8251269a0a 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c
@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "config.h"
-
 #include "nm-sd-adapt.h"
 
 #include <netinet/ether.h>
@@ -32,17 +30,17 @@
 #include "strv.h"
 #include "siphash24.h"
 #include "libudev-private.h"
-#endif
+#endif /* NM_IGNORED */
 #include "dhcp-lease-internal.h"
 #if 0 /* NM_IGNORED */
 #include "log.h"
 #include "utf8.h"
-#endif
+#endif /* NM_IGNORED */
 #include "util.h"
 #if 0 /* NM_IGNORED */
 #include "conf-parser.h"
 #include "condition.h"
-#endif
+#endif /* NM_IGNORED */
 #include "network-internal.h"
 
 #if 0 /* NM_IGNORED */
@@ -306,7 +304,7 @@ int config_parse_hwaddr(const char *unit,
 
         return 0;
 }
-#endif
+#endif /* NM_IGNORED */
 
 void serialize_in_addrs(FILE *f, const struct in_addr *addresses, size_t size) {
         unsigned i;
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.h b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.h
index f87c863d91..7a482f2043 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.h
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.h
@@ -65,7 +65,7 @@ int config_parse_ifalias(const char *unit, const char *filename, unsigned line,
 
 int net_get_unique_predictable_data(struct udev_device *device, uint8_t result[8]);
 const char *net_get_name(struct udev_device *device);
-#endif
+#endif /* NM_IGNORED */
 
 void serialize_in_addrs(FILE *f, const struct in_addr *addresses, size_t size);
 int deserialize_in_addrs(struct in_addr **addresses, const char *string);
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c
index 3e4cd8d9e7..d5ada92375 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c
@@ -17,8 +17,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "config.h"
-
 #include "nm-sd-adapt.h"
 
 #include <stdlib.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c
index 2d13d503e1..6a28f9b01f 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c
@@ -18,8 +18,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "config.h"
-
 #include "nm-sd-adapt.h"
 
 #include <stdlib.h>
@@ -34,7 +32,7 @@
 #include "list.h"
 #if 0 /* NM_IGNORED */
 #include "mkdir.h"
-#endif
+#endif /* NM_IGNORED */
 #include "fileio.h"
 #include "unaligned.h"
 #include "in-addr-util.h"
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c
index 6c5a6ab536..792e46d57a 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c
@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "config.h"
-
 #include "nm-sd-adapt.h"
 
 #include <errno.h>
@@ -32,7 +30,7 @@
 #include "udev.h"
 #include "udev-util.h"
 #include "virt.h"
-#endif
+#endif /* NM_IGNORED */
 #include "siphash24.h"
 #include "util.h"
 #include "refcnt.h"
@@ -1180,7 +1178,7 @@ int sd_dhcp6_client_new(sd_dhcp6_client **ret)
 #if 0 /* NM_IGNORED */
         sd_id128_t machine_id;
         int r;
-#endif
+#endif /* NM_IGNORED */
         size_t t;
 
         assert_return(ret, -EINVAL);
@@ -1210,7 +1208,7 @@ int sd_dhcp6_client_new(sd_dhcp6_client **ret)
         /* a bit of snake-oil perhaps, but no need to expose the machine-id
            directly */
         siphash24(client->duid.en.id, &machine_id, sizeof(machine_id), HASH_KEY.bytes);
-#endif
+#endif /* NM_IGNORED */
 
         client->req_opts_len = ELEMENTSOF(default_req_opts);
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c
index 0df6984d60..6a1cb22daa 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c
@@ -18,8 +18,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "config.h"
-
 #include "nm-sd-adapt.h"
 
 #include <errno.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/async.h b/src/dhcp-manager/systemd-dhcp/src/shared/async.h
index 7f1ef79532..44b886a661 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/async.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/async.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 int asynchronous_job(void* (*func)(void *p), void *arg);
 
 int asynchronous_sync(void);
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.c b/src/dhcp-manager/systemd-dhcp/src/shared/fileio.c
index 0757d5d977..84fd50495f 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/fileio.c
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "config.h"
+#include "nm-sd-adapt.h"
 
 #include <unistd.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.h b/src/dhcp-manager/systemd-dhcp/src/shared/fileio.h
index 5ae51c1e28..fccea7725a 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/fileio.h
@@ -20,6 +20,9 @@
   You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
+
+#include "nm-sd-adapt.h"
+
 #include <stddef.h>
 #include <stdio.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c b/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c
index 27edeb8d93..530be45e14 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "config.h"
+#include "nm-sd-adapt.h"
 
 #include <arpa/inet.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h b/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h
index 8da030ceb6..36afee2c42 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/in.h>
 
 #include "macro.h"
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/list.h b/src/dhcp-manager/systemd-dhcp/src/shared/list.h
index c020f7e936..dcb3e0d94c 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/list.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/list.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 /* The head of the linked list. Use this in the structure that shall
  * contain the head of the linked list */
 #define LIST_HEAD(t,name)                                               \
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/macro.h b/src/dhcp-manager/systemd-dhcp/src/shared/macro.h
index e6cf6eecd7..82469d81f0 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/macro.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/macro.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <assert.h>
 #include <sys/param.h>
 #include <sys/types.h>
@@ -410,4 +412,4 @@ do {                                                                    \
 #endif
 
 #include "log.h"
-#endif
+#endif /* NM_IGNORED */
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/refcnt.h b/src/dhcp-manager/systemd-dhcp/src/shared/refcnt.h
index 0502c20a2e..e6e9a6bd6e 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/refcnt.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/refcnt.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 /* A type-safe atomic refcounter */
 
 typedef struct {
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c b/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c
index f9e59c6f59..a26f8e28ca 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c
@@ -14,7 +14,8 @@
 
    (Minimal changes made by Lennart Poettering, to make clean for inclusion in systemd)
 */
-#include "config.h"
+
+#include "nm-sd-adapt.h"
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.h b/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.h
index 62e1168a79..3450d754fe 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "nm-sd-adapt.h"
+
 #include <inttypes.h>
 #include <sys/types.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h b/src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h
index 07d0aff72b..550ed9853b 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/ether.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h b/src/dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h
index c913fda8c5..02de0feca8 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h
@@ -21,6 +21,8 @@
 #ifndef SPARSE_ENDIAN_H
 #define SPARSE_ENDIAN_H
 
+#include "nm-sd-adapt.h"
+
 #include <byteswap.h>
 #include <endian.h>
 #include <stdint.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/strv.c b/src/dhcp-manager/systemd-dhcp/src/shared/strv.c
index be2bd51106..74a080ff16 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/strv.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/strv.c
@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "config.h"
-
 #include "nm-sd-adapt.h"
 
 #include <assert.h>
@@ -312,7 +310,7 @@ int strv_split_quoted(char ***t, const char *s, bool relax) {
 
         return 0;
 }
-#endif
+#endif /* NM_IGNORED */
 
 char *strv_join(char **l, const char *separator) {
         char *r, *e;
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/strv.h b/src/dhcp-manager/systemd-dhcp/src/shared/strv.h
index 47618bd26c..15ef0f1740 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/strv.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/strv.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <stdarg.h>
 #include <stdbool.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/time-util.c b/src/dhcp-manager/systemd-dhcp/src/shared/time-util.c
index c8fa1acba6..5d79f15dc0 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/time-util.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/time-util.c
@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "config.h"
-
 #include "nm-sd-adapt.h"
 
 #include <time.h>
@@ -32,7 +30,7 @@
 #include "time-util.h"
 #if 0 /* NM_IGNORED */
 #include "strv.h"
-#endif
+#endif /* NM_IGNORED */
 
 usec_t now(clockid_t clock_id) {
         struct timespec ts;
@@ -279,7 +277,7 @@ char *format_timestamp_relative(char *buf, size_t l, usec_t t) {
         buf[l-1] = 0;
         return buf;
 }
-#endif
+#endif /* NM_IGNORED */
 
 char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
         static const struct {
@@ -981,7 +979,7 @@ bool timezone_is_valid(const char *name) {
 
         return true;
 }
-#endif
+#endif /* NM_IGNORED */
 
 clockid_t clock_boottime_or_monotonic(void) {
         static clockid_t clock = -1;
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/time-util.h b/src/dhcp-manager/systemd-dhcp/src/shared/time-util.h
index 578a0c1ca4..e3e84acbae 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/time-util.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/time-util.h
@@ -21,14 +21,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <stdio.h>
 #include <inttypes.h>
 
 typedef uint64_t usec_t;
 typedef uint64_t nsec_t;
 
-#include "nm-sd-adapt.h"
-
 #define NSEC_FMT "%" PRIu64
 #define USEC_FMT "%" PRIu64
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/unaligned.h b/src/dhcp-manager/systemd-dhcp/src/shared/unaligned.h
index d6181dd9a9..3b73a9c682 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/unaligned.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/unaligned.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <stdint.h>
 
 static inline uint16_t unaligned_read_be16(const void *_u) {
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/utf8.c b/src/dhcp-manager/systemd-dhcp/src/shared/utf8.c
index cfedbfcb99..261f39db84 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/utf8.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/utf8.c
@@ -43,8 +43,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "config.h"
-
 #include "nm-sd-adapt.h"
 
 #include <errno.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/utf8.h b/src/dhcp-manager/systemd-dhcp/src/shared/utf8.h
index c087995930..d7728a162f 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/utf8.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/utf8.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <stdbool.h>
 
 #include "macro.h"
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/util.c b/src/dhcp-manager/systemd-dhcp/src/shared/util.c
index 05d4eb757a..010243b219 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/util.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/util.c
@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "config.h"
-
 #include "nm-sd-adapt.h"
 
 #include <assert.h>
@@ -90,7 +88,7 @@
 #include "gunicode.h"
 #include "virt.h"
 #include "def.h"
-#endif
+#endif /* NM_IGNORED */
 
 #if 0 /* NM_IGNORED */
 int saved_argc = 0;
@@ -112,7 +110,7 @@ size_t page_size(void) {
         pgsz = (size_t) r;
         return pgsz;
 }
-#endif
+#endif /* NM_IGNORED */
 
 bool streq_ptr(const char *a, const char *b) {
 
@@ -311,7 +309,7 @@ int parse_uid(const char *s, uid_t* ret_uid) {
         *ret_uid = uid;
         return 0;
 }
-#endif
+#endif /* NM_IGNORED */
 
 int safe_atou(const char *s, unsigned *ret_u) {
         char *x = NULL;
@@ -466,7 +464,7 @@ int safe_atod(const char *s, double *ret_d) {
         *ret_d = (double) d;
         return 0;
 }
-#endif
+#endif /* NM_IGNORED */
 
 static size_t strcspn_escaped(const char *s, const char *reject) {
         bool escaped = false;
@@ -617,7 +615,7 @@ int get_starttime_of_pid(pid_t pid, unsigned long long *st) {
 
         return 0;
 }
-#endif
+#endif /* NM_IGNORED */
 
 int fchmod_umask(int fd, mode_t m) {
         mode_t u;
@@ -875,7 +873,7 @@ int get_process_gid(pid_t pid, gid_t *gid) {
         assert_cc(sizeof(uid_t) == sizeof(gid_t));
         return get_process_id(pid, "Gid:", gid);
 }
-#endif
+#endif /* NM_IGNORED */
 
 char *strnappend(const char *s, const char *suffix, size_t b) {
         size_t a;
@@ -1049,7 +1047,7 @@ int reset_signal_mask(void) {
 
         return 0;
 }
-#endif
+#endif /* NM_IGNORED */
 
 char *strstrip(char *s) {
         char *e;
@@ -1158,7 +1156,7 @@ int rmdir_parents(const char *path, const char *stop) {
 
         return 0;
 }
-#endif
+#endif /* NM_IGNORED */
 
 char hexchar(int x) {
         static const char table[16] = "0123456789abcdef";
@@ -1646,7 +1644,7 @@ int close_all_fds(const int except[], unsigned n_except) {
 
         return r;
 }
-#endif
+#endif /* NM_IGNORED */
 
 bool chars_intersect(const char *a, const char *b) {
         const char *p;
@@ -2269,7 +2267,7 @@ void safe_close_pair(int p[]) {
         p[0] = safe_close(p[0]);
         p[1] = safe_close(p[1]);
 }
-#endif
+#endif /* NM_IGNORED */
 
 ssize_t loop_read(int fd, void *buf, size_t nbytes, bool do_poll) {
         uint8_t *p = buf;
@@ -2551,7 +2549,7 @@ char* dirname_malloc(const char *path) {
 
         return dir;
 }
-#endif
+#endif /* NM_IGNORED */
 
 int dev_urandom(void *p, size_t n) {
 #if 0 /* NM_IGNORED */
@@ -2597,7 +2595,7 @@ int dev_urandom(void *p, size_t n) {
 #else /* NM IGNORED */
         int fd;
         ssize_t k;
-#endif
+#endif /* NM_IGNORED */
 
         fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY);
         if (fd < 0)
@@ -3342,7 +3340,6 @@ fail:
         return NULL;
 }
 
-#if 0 /* NM_IGNORED */
 char **replace_env_argv(char **argv, char **env) {
         char **ret, **i;
         unsigned k = 0, l = 0;
@@ -3407,7 +3404,6 @@ char **replace_env_argv(char **argv, char **env) {
         ret[k] = NULL;
         return ret;
 }
-#endif
 
 int fd_columns(int fd) {
         struct winsize ws = {};
@@ -4171,7 +4167,7 @@ char* strshorten(char *s, size_t l) {
 
         return s;
 }
-#endif
+#endif /* NM_IGNORED */
 
 static bool hostname_valid_char(char c) {
         return
@@ -4274,7 +4270,7 @@ int pipe_eof(int fd) {
 
         return pollfd.revents & POLLHUP;
 }
-#endif
+#endif /* NM_IGNORED */
 
 int fd_wait_for_event(int fd, int event, usec_t t) {
 
@@ -4807,7 +4803,7 @@ int get_files_in_directory(const char *path, char ***list) {
 
         return n;
 }
-#endif
+#endif /* NM_IGNORED */
 
 char *strjoin(const char *x, ...) {
         va_list ap;
@@ -5174,7 +5170,7 @@ finish:
         return buf;
 
 }
-#endif
+#endif /* NM_IGNORED */
 
 void* memdup(const void *p, size_t l) {
         void *r;
@@ -5621,7 +5617,7 @@ bool string_is_safe(const char *p) {
 
         return true;
 }
-#endif
+#endif /* NM_IGNORED */
 
 /**
  * Check if a string contains control characters. If 'ok' is non-NULL
@@ -6124,7 +6120,7 @@ char *strrep(const char *s, unsigned n) {
         *p = 0;
         return r;
 }
-#endif
+#endif /* NM_IGNORED */
 
 void* greedy_realloc(void **p, size_t *allocated, size_t need, size_t size) {
         size_t a, newalloc;
@@ -6540,7 +6536,7 @@ int getpeersec(int fd, char **ret) {
         *ret = s;
         return 0;
 }
-#endif
+#endif /* NM_IGNORED */
 
 /* This is much like like mkostemp() but is subject to umask(). */
 int mkostemp_safe(char *pattern, int flags) {
@@ -6945,7 +6941,7 @@ int bind_remount_recursive(const char *prefix, bool ro) {
                 }
         }
 }
-#endif
+#endif /* NM_IGNORED */
 
 int fflush_and_check(FILE *f) {
         assert(f);
@@ -7007,7 +7003,7 @@ char *tempfn_random(const char *p) {
 
         return t;
 }
-#endif
+#endif /* NM_IGNORED */
 
 /* make sure the hostname is not "localhost" */
 bool is_localhost(const char *hostname) {
@@ -7346,5 +7342,5 @@ int sethostname_idempotent(const char *s) {
 
         return 1;
 }
-#endif
+#endif /* NM_IGNORED */
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/util.h b/src/dhcp-manager/systemd-dhcp/src/shared/util.h
index a7690655eb..68b08c4016 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/util.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/util.h
@@ -85,12 +85,12 @@
 #else
 #  error Unknown rlim_t size
 #endif
-#endif
+#endif /* NM_IGNORED */
 
 #include "macro.h"
 #if 0 /* NM_IGNORED */
 #include "missing.h"
-#endif
+#endif /* NM_IGNORED */
 #include "time-util.h"
 
 /* What is interpreted as whitespace? */
@@ -987,7 +987,7 @@ bool pid_is_unwaited(pid_t pid);
 #if 0 /* NM_IGNORED */
 int getpeercred(int fd, struct ucred *ucred);
 int getpeersec(int fd, char **ret);
-#endif
+#endif /* NM_IGNORED */
 
 int writev_safe(int fd, const struct iovec *w, int j);
 
@@ -1010,7 +1010,7 @@ union file_handle_union {
         struct file_handle handle;
         char padding[sizeof(struct file_handle) + MAX_HANDLE_SZ];
 };
-#endif
+#endif /* NM_IGNORED */
 
 int update_reboot_param_file(const char *param);
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h b/src/dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h
index 896a027eb5..abcd57dbe4 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h
+++ b/src/dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h
@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 /* This is a private header; never even think of including this directly! */
 
 #if __INCLUDE_LEVEL__ <= 1
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h
index 951662e56c..527c4239d1 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h
+++ b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h
@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/in.h>
 #include <net/ethernet.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h
index 4296b91d8a..80d32134b1 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h
+++ b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h
@@ -23,6 +23,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/in.h>
 #include <net/ethernet.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h
index 38c1c3fb12..301f306705 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h
+++ b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h
@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <net/ethernet.h>
 
 #include "sd-event.h"
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h
index 1126f1ac2e..e72eb8be05 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h
+++ b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h
@@ -23,6 +23,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/in.h>
 
 typedef struct sd_dhcp6_lease sd_dhcp6_lease;
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-event.h b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-event.h
index 25a10f99ab..00bc0fc77e 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-event.h
+++ b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-event.h
@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <sys/types.h>
 #include <sys/signalfd.h>
 #include <sys/epoll.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h
index 4fdbf3ab41..df9b83c4c0 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h
+++ b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h
@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <inttypes.h>
 #include <string.h>
 
diff --git a/src/nm-logging.c b/src/nm-logging.c
index 7f2170ca39..1e9d422f2a 100644
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -365,6 +365,7 @@ _nm_log (const char *file,
          const char *func,
          NMLogLevel level,
          NMLogDomain domain,
+         int error,
          const char *fmt,
          ...)
 {
@@ -382,6 +383,10 @@ _nm_log (const char *file,
 	if (!(logging[level] & domain))
 		return;
 
+	/* Make sure that %m maps to the specified error */
+	if (error != 0)
+		errno = error;
+
 	va_start (args, fmt);
 	msg = g_strdup_vprintf (fmt, args);
 	va_end (args);
diff --git a/src/nm-logging.h b/src/nm-logging.h
index 4ab2db3ad5..7417dfa0f7 100644
--- a/src/nm-logging.h
+++ b/src/nm-logging.h
@@ -105,7 +105,7 @@ typedef enum  { /*< skip >*/
 #define nm_log(level, domain, ...) \
     G_STMT_START { \
         if (nm_logging_enabled ((level), (domain))) { \
-            _nm_log (__FILE__, __LINE__, G_STRFUNC, (level), (domain), __VA_ARGS__); \
+            _nm_log (__FILE__, __LINE__, G_STRFUNC, (level), (domain), 0, __VA_ARGS__); \
         } \
     } G_STMT_END
 
@@ -139,8 +139,9 @@ void _nm_log (const char *file,
               const char *func,
               NMLogLevel level,
               NMLogDomain domain,
+              int error,
               const char *fmt,
-              ...) __attribute__((__format__ (__printf__, 6, 7)));
+              ...) __attribute__((__format__ (__printf__, 7, 8)));
 
 const char *nm_logging_level_to_string (void);
 const char *nm_logging_domains_to_string (void);