diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-05-07 20:55:11 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-05-07 20:56:41 +0200 |
| commit | e724b0639c43c2821613fc4f7f755f87c49a22e8 (patch) | |
| tree | 1c981e6dd6521cd1188abb3ab2536279b5bc3747 /src/journal | |
| parent | 0b95a21bd70f63fc57f62020ae84e467712d69f2 (diff) | |
hostname: only suppress setting of pretty hostname if it is non-equal to the static hostname and if the static hostname is set, too
https://bugzilla.redhat.com/show_bug.cgi?id=957814
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/journal-gatewayd.c | 2 | ||||
| -rw-r--r-- | src/journal/journalctl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/journal-gatewayd.c b/src/journal/journal-gatewayd.c index 51a938b79e..745f45f932 100644 --- a/src/journal/journal-gatewayd.c +++ b/src/journal/journal-gatewayd.c @@ -839,7 +839,7 @@ static int request_handler_machine( "\"cutoff_to_realtime\" : \"%llu\" }\n", SD_ID128_FORMAT_VAL(mid), SD_ID128_FORMAT_VAL(bid), - hostname_cleanup(hostname), + hostname_cleanup(hostname, false), os_name ? os_name : "Linux", v ? v : "bare", (unsigned long long) usage, diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index d1b201beba..409f082276 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -835,7 +835,7 @@ static int setup_keys(void) { hn = gethostname_malloc(); if (hn) { - hostname_cleanup(hn); + hostname_cleanup(hn, false); fprintf(stderr, "\nThe keys have been generated for host %s/" SD_ID128_FORMAT_STR ".\n", hn, SD_ID128_FORMAT_VAL(machine)); } else fprintf(stderr, "\nThe keys have been generated for host " SD_ID128_FORMAT_STR ".\n", SD_ID128_FORMAT_VAL(machine)); |