]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Revert "resolve: refuse to resolve empty hostname"
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 23 Jan 2022 20:51:47 +0000 (05:51 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 23 Jan 2022 20:51:47 +0000 (05:51 +0900)
This reverts commit 6e8ecb8974db74eba716bfd75231987172e10d83.

src/resolve/resolved-bus.c
src/resolve/resolved-varlink.c
src/shared/dns-domain.h

index 9978d35727b39ae3436b1874770afb19e96bd6ad..48e5321d79a8965068de021c52693ee87cb93478 100644 (file)
@@ -433,9 +433,6 @@ static int bus_method_resolve_hostname(sd_bus_message *message, void *userdata,
         if (r != 0)
                 return r;
 
-        if (dns_name_is_empty(hostname))
-                return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Empty hostname");
-
         r = dns_name_is_valid(hostname);
         if (r < 0)
                 return r;
@@ -743,9 +740,6 @@ static int bus_method_resolve_record(sd_bus_message *message, void *userdata, sd
         if (ifindex < 0)
                 return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid interface index");
 
-        if (dns_name_is_empty(name))
-                return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Empty name");
-
         r = dns_name_is_valid(name);
         if (r < 0)
                 return r;
index feca5f74f1fcc30a684893c23bb7d8526bd1d083..cc684608a601185688746283b24807766651a3fa 100644 (file)
@@ -303,9 +303,6 @@ static int vl_method_resolve_hostname(Varlink *link, JsonVariant *parameters, Va
         if (p.ifindex < 0)
                 return varlink_error_invalid_parameter(link, JSON_VARIANT_STRING_CONST("ifindex"));
 
-        if (dns_name_is_empty(p.name))
-                return varlink_error_invalid_parameter(link, JSON_VARIANT_STRING_CONST("name"));
-
         r = dns_name_is_valid(p.name);
         if (r < 0)
                 return r;
index 24bf00bd58b79c076ad8694cd6ede2ed0f3c4eec..c25fcaacc2a74cb6ac077f3935d1742fb39fa002 100644 (file)
@@ -60,10 +60,6 @@ static inline int dns_name_is_valid_ldh(const char *s) {
         return 1;
 }
 
-static inline bool dns_name_is_empty(const char *s) {
-        return isempty(s) || streq(s, ".");
-}
-
 void dns_name_hash_func(const char *s, struct siphash *state);
 int dns_name_compare_func(const char *a, const char *b);
 extern const struct hash_ops dns_name_hash_ops;