shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

firstboot: allow a trailing dot on fqdn

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-07-27 22:20:46 -04:00
parent 8fb4944358
commit 34ad609010
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/firstboot/firstboot.c
View File

@ -386,12 +386,13 @@ static int prompt_hostname(void) {
break; break;
} }
if (!hostname_is_valid(h, false)) { if (!hostname_is_valid(h, true)) {
log_error("Specified hostname invalid."); log_error("Specified hostname invalid.");
continue; continue;
} }
arg_hostname = h; /* Get rid of the trailing dot that we allow, but don't want to see */
arg_hostname = hostname_cleanup(h, false);
h = NULL; h = NULL;
break; break;
} }
@ -780,11 +781,12 @@ static int parse_argv(int argc, char *argv[]) {
break; break;
case ARG_HOSTNAME: case ARG_HOSTNAME:
if (!hostname_is_valid(optarg, false)) { if (!hostname_is_valid(optarg, true)) {
log_error("Host name %s is not valid.", optarg); log_error("Host name %s is not valid.", optarg);
return -EINVAL; return -EINVAL;
} }
hostname_cleanup(optarg, false);
if (free_and_strdup(&arg_hostname, optarg) < 0) if (free_and_strdup(&arg_hostname, optarg) < 0)
return log_oom(); return log_oom();