chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostnamectl: if somebody invokes 'hostnamectl set-hostname' with a valid internet...
[elogind.git]
/
src
/
hostname
/
hostnamed.c
diff --git
a/src/hostname/hostnamed.c
b/src/hostname/hostnamed.c
index b4d6d51402c71b7c84344ef452030302c8e07979..0437e33a664c18016ab0319552ebe088c15719a5 100644
(file)
--- a/
src/hostname/hostnamed.c
+++ b/
src/hostname/hostnamed.c
@@
-303,7
+303,7
@@
static int write_data_other(void) {
char **l = NULL;
int r, p;
char **l = NULL;
int r, p;
- r = load_env_file("/etc/machine-info", &l);
+ r = load_env_file("/etc/machine-info",
NULL,
&l);
if (r < 0 && r != -ENOENT)
return r;
if (r < 0 && r != -ENOENT)
return r;
@@
-444,7
+444,7
@@
static DBusHandlerResult hostname_message_handler(
return bus_send_error_reply(connection, message, NULL, r);
}
return bus_send_error_reply(connection, message, NULL, r);
}
- log_info("Changed host name to '%s'", str
empty
(data[PROP_HOSTNAME]));
+ log_info("Changed host name to '%s'", str
na
(data[PROP_HOSTNAME]));
changed = bus_properties_changed_new(
"/org/freedesktop/hostname1",
changed = bus_properties_changed_new(
"/org/freedesktop/hostname1",
@@
-498,7
+498,7
@@
static DBusHandlerResult hostname_message_handler(
return bus_send_error_reply(connection, message, NULL, r);
}
return bus_send_error_reply(connection, message, NULL, r);
}
- log_info("Changed static host name to '%s'", str
empty
(data[PROP_STATIC_HOSTNAME]));
+ log_info("Changed static host name to '%s'", str
na
(data[PROP_STATIC_HOSTNAME]));
changed = bus_properties_changed_new(
"/org/freedesktop/hostname1",
changed = bus_properties_changed_new(
"/org/freedesktop/hostname1",
@@
-574,7
+574,7
@@
static DBusHandlerResult hostname_message_handler(
log_info("Changed %s to '%s'",
k == PROP_PRETTY_HOSTNAME ? "pretty host name" :
log_info("Changed %s to '%s'",
k == PROP_PRETTY_HOSTNAME ? "pretty host name" :
- k == PROP_CHASSIS ? "chassis" : "icon name", str
empty
(data[k]));
+ k == PROP_CHASSIS ? "chassis" : "icon name", str
na
(data[k]));
changed = bus_properties_changed_new(
"/org/freedesktop/hostname1",
changed = bus_properties_changed_new(
"/org/freedesktop/hostname1",