From 7a08b29a3d5da7963cf2755da49c4aedbe5746df Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Thu, 17 Oct 2019 17:39:56 +0200 Subject: [PATCH] shared: export systemd dns and hostname validation functions (cherry picked from commit 38f942e0386462f95aa95cb8162393e4a53ada1a) --- shared/systemd/nm-sd-utils-shared.c | 15 +++++++++++++-- shared/systemd/nm-sd-utils-shared.h | 3 +++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/shared/systemd/nm-sd-utils-shared.c b/shared/systemd/nm-sd-utils-shared.c index ee297ceaab..805c8403c5 100644 --- a/shared/systemd/nm-sd-utils-shared.c +++ b/shared/systemd/nm-sd-utils-shared.c @@ -22,9 +22,10 @@ #include "nm-sd-adapt-shared.h" -#include "path-util.h" -#include "hexdecoct.h" #include "dns-domain.h" +#include "hexdecoct.h" +#include "hostname-util.h" +#include "path-util.h" /*****************************************************************************/ @@ -96,3 +97,13 @@ int nm_sd_dns_name_to_wire_format (const char *domain, { return dns_name_to_wire_format (domain, buffer, len, canonical); } + +int nm_sd_dns_name_is_valid (const char *s) +{ + return dns_name_is_valid (s); +} + +gboolean nm_sd_hostname_is_valid (const char *s, bool allow_trailing_dot) +{ + return hostname_is_valid (s, allow_trailing_dot); +} diff --git a/shared/systemd/nm-sd-utils-shared.h b/shared/systemd/nm-sd-utils-shared.h index 48a8cf37ac..5465a01aca 100644 --- a/shared/systemd/nm-sd-utils-shared.h +++ b/shared/systemd/nm-sd-utils-shared.h @@ -44,4 +44,7 @@ int nm_sd_dns_name_to_wire_format (const char *domain, size_t len, gboolean canonical); +int nm_sd_dns_name_is_valid (const char *s); +gboolean nm_sd_hostname_is_valid(const char *s, bool allow_trailing_dot); + #endif /* __NM_SD_UTILS_SHARED_H__ */