Merge pull request #5175 from keszybz/hostname-fallback

Allow distributions to override the "localhost" fallback
This commit is contained in:
Martin Pitt
2017-01-31 08:26:42 +01:00
committed by GitHub
2 changed files with 16 additions and 6 deletions
+2 -2
View File
@@ -283,7 +283,7 @@ static int context_update_kernel_hostname(Context *c) {
/* ... and the ultimate fallback */
else
hn = "localhost";
hn = FALLBACK_HOSTNAME;
if (sethostname_idempotent(hn) < 0)
return -errno;
@@ -419,7 +419,7 @@ static int method_set_hostname(sd_bus_message *m, void *userdata, sd_bus_error *
name = c->data[PROP_STATIC_HOSTNAME];
if (isempty(name))
name = "localhost";
name = FALLBACK_HOSTNAME;
if (!hostname_is_valid(name, false))
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid hostname '%s'", name);