2
1

0003-network-generator-allow-empty-hostname.patch 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. From 21a925a4ac7955e7d7e6cfd477e96d3a2aaee7db Mon Sep 17 00:00:00 2001
  2. From: Yu Watanabe <watanabe.yu+github@gmail.com>
  3. Date: Thu, 12 Dec 2019 19:01:21 +0900
  4. Subject: [PATCH 1/1] network-generator: allow empty hostname
  5. Fixes #14319.
  6. [Brandon: backport from https://github.com/systemd/systemd/commit/21a925a4ac7955e7d7e6cfd477e96d3a2aaee7db]
  7. Signed-off-by: Brandon Maier <brandon.maier@rockwellcollins.com>
  8. ---
  9. src/network/generator/network-generator.c | 10 ++++++----
  10. 1 file changed, 6 insertions(+), 4 deletions(-)
  11. diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
  12. index 81afa95307..bed1e42697 100644
  13. --- a/src/network/generator/network-generator.c
  14. +++ b/src/network/generator/network-generator.c
  15. @@ -574,7 +574,7 @@ static int parse_netmask_or_prefixlen(int family, const char **value, unsigned c
  16. static int parse_cmdline_ip_address(Context *context, int family, const char *value) {
  17. union in_addr_union addr = {}, peer = {}, gateway = {};
  18. - const char *hostname, *ifname, *dhcp_type, *dns, *p;
  19. + const char *hostname = NULL, *ifname, *dhcp_type, *dns, *p;
  20. unsigned char prefixlen;
  21. int r;
  22. @@ -599,9 +599,11 @@ static int parse_cmdline_ip_address(Context *context, int family, const char *va
  23. if (!p)
  24. return -EINVAL;
  25. - hostname = strndupa(value, p - value);
  26. - if (!hostname_is_valid(hostname, false))
  27. - return -EINVAL;
  28. + if (p != value) {
  29. + hostname = strndupa(value, p - value);
  30. + if (!hostname_is_valid(hostname, false))
  31. + return -EINVAL;
  32. + }
  33. value = p + 1;
  34. --
  35. 2.23.0