util: make machine_name_is_valid() a macro and move it to hostname-util.h

As it turns out machine_name_is_valid() does the exact same thing as
hostname_is_valid() these days, as it just invoked that and checked the
name length was < 64. However, hostname_is_valid() checks the length
against HOST_NAME_MAX anyway (which is 64 on Linux), hence any
additional check is redundant.

We hence replace machine_name_is_valid() by a macro that simply maps it
to hostname_is_valid() but sets the allow_trailing_dot parameter to
false. We also move this this call to hostname-util.h, to the same place
as the hostname_is_valid() declaration.

diff --git a/src/basic/hostname-util.h b/src/basic/hostname-util.h
index 7c50260..d4f5bfe 100644 (file)
--- a/src/basic/hostname-util.h
+++ b/src/basic/hostname-util.h
@@ -32,6 +32,8 @@ char* gethostname_malloc(void);
 bool hostname_is_valid(const char *s, bool allow_trailing_dot) _pure_;
 char* hostname_cleanup(char *s);
 
+#define machine_name_is_valid(s) hostname_is_valid(s, false)
+
 bool is_localhost(const char *hostname);
 bool is_gateway_hostname(const char *hostname);
 

diff --git a/src/basic/util.c b/src/basic/util.c
index 9571f0a..deff680 100644 (file)
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -3006,21 +3006,6 @@ char* strshorten(char *s, size_t l) {
         return s;
 }
 
-bool machine_name_is_valid(const char *s) {
-
-        if (!hostname_is_valid(s, false))
-                return false;
-
-        /* Machine names should be useful hostnames, but also be
-         * useful in unit names, hence we enforce a stricter length
-         * limitation. */
-
-        if (strlen(s) > 64)
-                return false;
-
-        return true;
-}
-
 int pipe_eof(int fd) {
         struct pollfd pollfd = {
                 .fd = fd,

diff --git a/src/basic/util.h b/src/basic/util.h
index 8f21d56..1ead7b5 100644 (file)
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -394,8 +394,6 @@ bool nulstr_contains(const char*nulstr, const char *needle);
 
 bool plymouth_running(void);
 
-bool machine_name_is_valid(const char *s) _pure_;
-
 char* strshorten(char *s, size_t l);
 
 int symlink_idempotent(const char *from, const char *to);

diff --git a/src/import/export.c b/src/import/export.c
index ec7dbe2..b88d71f 100644 (file)
--- a/src/import/export.c
+++ b/src/import/export.c
@@ -24,6 +24,7 @@
 #include "sd-event.h"
 #include "event-util.h"
 #include "signal-util.h"
+#include "hostname-util.h"
 #include "verbs.h"
 #include "build.h"
 #include "machine-image.h"

diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index 43cd413..a27e81b 100644 (file)
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -26,6 +26,7 @@
 #include "util.h"
 #include "path-util.h"
 #include "btrfs-util.h"
+#include "hostname-util.h"
 #include "copy.h"
 #include "mkdir.h"
 #include "rm-rf.h"

diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index 2bf0b06..7ffe83c 100644 (file)
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -26,6 +26,7 @@
 #include "util.h"
 #include "path-util.h"
 #include "btrfs-util.h"
+#include "hostname-util.h"
 #include "copy.h"
 #include "mkdir.h"
 #include "rm-rf.h"

diff --git a/src/import/import.c b/src/import/import.c
index b777239..929a840 100644 (file)
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -26,6 +26,7 @@
 #include "verbs.h"
 #include "build.h"
 #include "signal-util.h"
+#include "hostname-util.h"
 #include "machine-image.h"
 #include "import-util.h"
 #include "import-tar.h"

diff --git a/src/import/importd.c b/src/import/importd.c
index dd314f5..8b508ea 100644 (file)
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -35,6 +35,7 @@
 #include "import-util.h"
 #include "process-util.h"
 #include "signal-util.h"
+#include "hostname-util.h"
 
 typedef struct Transfer Transfer;
 typedef struct Manager Manager;

diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index 5bfaf01..d0e0faa 100644 (file)
--- a/src/import/pull-raw.c
+++ b/src/import/pull-raw.c
@@ -33,6 +33,7 @@
 #include "mkdir.h"
 #include "rm-rf.h"
 #include "path-util.h"
+#include "hostname-util.h"
 #include "import-util.h"
 #include "import-common.h"
 #include "curl-util.h"

diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index 71b8908..d38a215 100644 (file)
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -32,13 +32,14 @@
 #include "mkdir.h"
 #include "rm-rf.h"
 #include "path-util.h"
+#include "process-util.h"
+#include "hostname-util.h"
 #include "import-util.h"
 #include "import-common.h"
 #include "curl-util.h"
 #include "pull-job.h"
 #include "pull-common.h"
 #include "pull-tar.h"
-#include "process-util.h"
 
 typedef enum TarProgress {
         TAR_DOWNLOADING,

diff --git a/src/import/pull.c b/src/import/pull.c
index ca7be6b..e13cd6a 100644 (file)
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -26,6 +26,7 @@
 #include "verbs.h"
 #include "build.h"
 #include "signal-util.h"
+#include "hostname-util.h"
 #include "machine-image.h"
 #include "import-util.h"
 #include "pull-tar.h"

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index bfd1901..13fa9b5 100644 (file)
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -43,6 +43,7 @@
 #include "replace-var.h"
 #include "fileio.h"
 #include "formats-util.h"
+#include "hostname-util.h"
 
 #define JOURNAL_FILES_MAX 7168
 

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index db4f21e..31cdcb4 100644 (file)
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -33,6 +33,7 @@
 #include "missing.h"
 #include "def.h"
 #include "cgroup-util.h"
+#include "hostname-util.h"
 #include "bus-label.h"
 
 #include "sd-bus.h"

diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c
index 9bbf897..5f29057 100644 (file)
--- a/src/libsystemd/sd-login/sd-login.c
+++ b/src/libsystemd/sd-login/sd-login.c
@@ -32,6 +32,7 @@
 #include "fileio.h"
 #include "login-util.h"
 #include "formats-util.h"
+#include "hostname-util.h"
 #include "sd-login.h"
 
 _public_ int sd_pid_get_session(pid_t pid, char **session) {

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 8e75508..72b9a61 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -56,6 +56,7 @@
 #include "terminal-util.h"
 #include "signal-util.h"
 #include "env-util.h"
+#include "hostname-util.h"
 
 static char **arg_property = NULL;
 static bool arg_all = false;

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 9351498..03625ba 100644 (file)
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -33,6 +33,7 @@
 #include "btrfs-util.h"
 #include "formats-util.h"
 #include "process-util.h"
+#include "hostname-util.h"
 #include "machine-image.h"
 #include "machine-pool.h"
 #include "image-dbus.h"

diff --git a/src/machine/machined.c b/src/machine/machined.c
index c8ad157..109bab7 100644 (file)
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -30,6 +30,7 @@
 #include "label.h"
 #include "formats-util.h"
 #include "signal-util.h"
+#include "hostname-util.h"
 #include "machine-image.h"
 #include "machined.h"
 

diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c
index cdec83d..5758ea1 100644 (file)
--- a/src/nss-mymachines/nss-mymachines.c
+++ b/src/nss-mymachines/nss-mymachines.c
@@ -30,6 +30,7 @@
 #include "bus-util.h"
 #include "bus-common-errors.h"
 #include "in-addr-util.h"
+#include "hostname-util.h"
 
 NSS_GETHOSTBYNAME_PROTOTYPES(mymachines);
 NSS_GETPW_PROTOTYPES(mymachines);

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 60144ab..9a5ffb7 100644 (file)
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -34,6 +34,7 @@
 #include "formats-util.h"
 #include "process-util.h"
 #include "terminal-util.h"
+#include "hostname-util.h"
 
 /* up to three lines (each up to 100 characters),
    or 300 characters, whichever is less */