From 6547ec0ad8451d72e43ba4ea38c2300c67eb501a Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 3 Sep 2017 19:44:07 +0200 Subject: [PATCH] hurd: fix resolv/tst-resolv-res_init-skeleton.c build * resolv/tst-resolv-res_init-skeleton.c (run_res_init) [!CLONE_NEWUTS]: Fail as unsupported if hostname is not NULL. --- ChangeLog | 2 ++ resolv/tst-resolv-res_init-skeleton.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 824f19a272..f2e61b7ffd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,8 @@ RWF_NOWAIT): Define to 0 if undefined already. (do_test_with_invalid_flags): Set invalid_flag to 2 if RWF_SUPPORTED boils down to 0. + * resolv/tst-resolv-res_init-skeleton.c (run_res_init) + [!CLONE_NEWUTS]: Fail as unsupported if hostname is not NULL. 2017-09-01 Joseph Myers diff --git a/resolv/tst-resolv-res_init-skeleton.c b/resolv/tst-resolv-res_init-skeleton.c index 3b7b4129e3..a1bf110910 100644 --- a/resolv/tst-resolv-res_init-skeleton.c +++ b/resolv/tst-resolv-res_init-skeleton.c @@ -341,11 +341,15 @@ run_res_init (void *closure) setenv ("RES_OPTIONS", ctx->t->res_options, 1); if (ctx->t->hostname != NULL) { +#ifdef CLONE_NEWUTS /* This test needs its own namespace, to avoid changing the host name for the parent, too. */ TEST_VERIFY_EXIT (unshare (CLONE_NEWUTS) == 0); if (sethostname (ctx->t->hostname, strlen (ctx->t->hostname)) != 0) FAIL_EXIT1 ("sethostname (\"%s\"): %m", ctx->t->hostname); +#else + FAIL_UNSUPPORTED ("clone (CLONE_NEWUTS) not supported"); +#endif } switch (ctx->init)