morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

musl: hostname-util: introduce LINUX_HOST_NAME_MAX

Browse Source 
glibc defines HOST_NAME_MAX as 64 and our code rely on that, but musl
defines the constant as 255. Let's provide our own definition for the
maximum length.
This commit is contained in:
Yu Watanabe
2025-09-07 06:16:02 +09:00
parent e1ddcb1125
commit 5bb9063505
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/basic/hostname-util.c
View File

@@ -94,8 +94,8 @@ bool hostname_is_valid(const char *s, ValidHostnameFlags flags) {
if (hyphen)
return false;
if (p-s > HOST_NAME_MAX) /* Note that HOST_NAME_MAX is 64 on Linux, but DNS allows domain names up to
* 255 characters */
/* Note that host name max is 64 on Linux, but DNS allows domain names up to 255 characters. */
if (p - s > (ssize_t) LINUX_HOST_NAME_MAX)
return false;
return true;
@@ -107,7 +107,7 @@ char* hostname_cleanup(char *s) {
assert(s);
for (p = s, d = s, dot = hyphen = true; *p && d - s < HOST_NAME_MAX; p++)
for (p = s, d = s, dot = hyphen = true; *p && d - s < (ssize_t) LINUX_HOST_NAME_MAX; p++)
if (*p == '.') {
if (dot || hyphen)
continue;

3
src/basic/hostname-util.h
View File

@@ -4,6 +4,9 @@
#include "basic-forward.h"
#include "strv.h"
/* HOST_NAME_MAX should be 64 on linux, but musl uses the one by POSIX (255). */
#define LINUX_HOST_NAME_MAX CONST_MIN((size_t) HOST_NAME_MAX, (size_t) 64)
char* get_default_hostname_raw(void);
bool valid_ldh_char(char c) _const_;

2
src/core/load-fragment.c
View File

@@ -6633,7 +6633,7 @@ int config_parse_protect_hostname(
const char *colon = strchr(rvalue, ':');
if (colon) {
r = unit_full_printf_full(u, colon + 1, HOST_NAME_MAX, &h);
r = unit_full_printf_full(u, colon + 1, LINUX_HOST_NAME_MAX, &h);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Failed to resolve unit specifiers in '%s', ignoring: %m", colon + 1);

8
src/libsystemd-network/sd-lldp-tx.c
View File

@@ -186,12 +186,8 @@ int sd_lldp_tx_set_hostname(sd_lldp_tx *lldp_tx, const char *hostname) {
assert_return(lldp_tx, -EINVAL);
/* An empty string unset the previously set hostname. */
if (!isempty(hostname)) {
assert_cc(HOST_NAME_MAX < 512);
if (!hostname_is_valid(hostname, 0))
return -EINVAL;
}
if (!isempty(hostname) && !hostname_is_valid(hostname, /* flags= */ 0))
return -EINVAL;
return free_and_strdup(&lldp_tx->hostname, empty_to_null(hostname));
}

6
src/shared/hostname-setup.c
View File

@@ -51,7 +51,7 @@ int sethostname_idempotent(const char *s) {
int shorten_overlong(const char *s, char **ret) {
_cleanup_free_ char *h = NULL;
/* Shorten an overlong name to HOST_NAME_MAX or to the first dot,
/* Shorten an overlong name to LINUX_HOST_NAME_MAX or to the first dot,
* whatever comes earlier. */
assert(s);
@@ -70,7 +70,7 @@ int shorten_overlong(const char *s, char **ret) {
if (p)
*p = 0;
strshorten(h, HOST_NAME_MAX);
strshorten(h, LINUX_HOST_NAME_MAX);
if (!hostname_is_valid(h, /* flags= */ 0))
return -EDOM;
@@ -403,7 +403,7 @@ int pidref_gethostname_full(PidRef *pidref, GetHostnameFlags flags, char **ret)
if (r < 0)
return r;
char buf[HOST_NAME_MAX+1];
char buf[LINUX_HOST_NAME_MAX+1];
ssize_t n = loop_read(result_pipe[0], buf, sizeof(buf), /* do_poll = */ false);
if (n < 0)
return n;