Merge remote-tracking branch 'salsa/master'

1 files changed, 13 insertions, 0 deletions

diff --git a/shared/systemd/nm-sd-utils-shared.c b/shared/systemd/nm-sd-utils-shared.c
index ecd27492..7206fa52 100644
--- a/shared/systemd/nm-sd-utils-shared.c
+++ b/shared/systemd/nm-sd-utils-shared.c
@@ -24,6 +24,11 @@
 
 #include "path-util.h"
 #include "hexdecoct.h"
+#include "dns-domain.h"
+
+/*****************************************************************************/
+
+const bool mempool_use_allowed = true;
 
 /*****************************************************************************/
 
@@ -83,3 +88,11 @@ nm_sd_utils_unbase64mem (const char *p,
 {
 	return unbase64mem_full (p, l, secure, (void **) mem, len);
 }
+
+int nm_sd_dns_name_to_wire_format (const char *domain,
+                                   guint8 *buffer,
+                                   size_t len,
+                                   gboolean canonical)
+{
+	return dns_name_to_wire_format (domain, buffer, len, canonical);
+}