summaryrefslogtreecommitdiff
path: root/src/import/pull-tar.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2020-12-11 16:40:45 +0100
committerLennart Poettering <lennart@poettering.net>2020-12-15 17:59:48 +0100
commit52ef5dd7989d886945e18ab50de31bf5a21ba158 (patch)
treeed64c0d2c22b0ea1a1375c24ca692fdad3e4e07e /src/import/pull-tar.c
parent9e815cf2c2d8463e58c6609edb6a33f9bb62e7b5 (diff)
downloadsystemd-52ef5dd7989d886945e18ab50de31bf5a21ba158.tar.gz
hostname-util: flagsify hostname_is_valid(), drop machine_name_is_valid()
Let's clean up hostname_is_valid() a bit: let's turn the second boolean argument into a more explanatory flags field, and add a flag that accepts the special name ".host" as valid. This is useful for the container logic, where the special hostname ".host" refers to the "root container", i.e. the host system itself, and can be specified at various places. let's also get rid of machine_name_is_valid(). It was just an alias, which is confusing and even more so now that we have the flags param.
Diffstat (limited to 'src/import/pull-tar.c')
-rw-r--r--src/import/pull-tar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index 72e5b8be27..bbbd0f57a0 100644
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -481,7 +481,7 @@ int tar_pull_start(
if (!http_url_is_valid(url))
return -EINVAL;
- if (local && !machine_name_is_valid(local))
+ if (local && !hostname_is_valid(local, 0))
return -EINVAL;
if (i->tar_job)