From 8fb494435889dcb9e1c09b8c7220e47bab717bf9 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mon, 27 Jul 2015 22:15:26 -0400 Subject: hostname-util: add relax parameter to hostname_is_valid Tests are modified to check behaviour with relax and without relax. New tests are added for hostname_cleanup(). Tests are moved a new file (test-hostname-util) because there's now a bunch of them. New parameter is not used anywhere, except in tests, so there should be no observable change. --- src/firstboot/firstboot.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/firstboot') diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 3805b29437..43669d28bf 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -386,7 +386,7 @@ static int prompt_hostname(void) { break; } - if (!hostname_is_valid(h)) { + if (!hostname_is_valid(h, false)) { log_error("Specified hostname invalid."); continue; } @@ -780,14 +780,12 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_HOSTNAME: - if (!hostname_is_valid(optarg)) { + if (!hostname_is_valid(optarg, false)) { log_error("Host name %s is not valid.", optarg); return -EINVAL; } - free(arg_hostname); - arg_hostname = strdup(optarg); - if (!arg_hostname) + if (free_and_strdup(&arg_hostname, optarg) < 0) return log_oom(); break; -- cgit v1.2.3-54-g00ecf