hostname-setup: also consider (ńone) an unset hostname

This commit is contained in:
Lennart Poettering
2012-05-21 17:19:58 +02:00
parent 97f25a02ee
commit 344de60901
3 changed files with 17 additions and 19 deletions
+9 -1
View File
@@ -2949,12 +2949,20 @@ char* gethostname_malloc(void) {
assert_se(uname(&u) >= 0);
if (u.nodename[0])
if (!isempty(u.nodename) && !streq(u.nodename, "(none)"))
return strdup(u.nodename);
return strdup(u.sysname);
}
bool hostname_is_set(void) {
struct utsname u;
assert_se(uname(&u) >= 0);
return !isempty(u.nodename) && !streq(u.nodename, "(none)");
}
char* getlogname_malloc(void) {
uid_t uid;
long bufsize;
+1
View File
@@ -337,6 +337,7 @@ void rename_process(const char name[8]);
void sigset_add_many(sigset_t *ss, ...);
char* gethostname_malloc(void);
bool hostname_is_set(void);
char* getlogname_malloc(void);
int getttyname_malloc(int fd, char **r);