If people are unaware or uninterested in the concept of pretty host
names, and simply invoke "hostnamectl set-hostname" for a valid internet
host name, then use this as indication to unset the pretty host name and
only set the static/dynamic one.
This also allows fqdn, hence "hostnamectl set-hostname www.foobar.com"
will just work if people really insist on using fqdns as hostnames.
polkit_agent_open_if_enabled();
if (arg_set_pretty) {
polkit_agent_open_if_enabled();
if (arg_set_pretty) {
+ const char *p;
+
+ /* If the passed hostname is already valid, then
+ * assume the user doesn't know anything about pretty
+ * hostnames, so let's unset the pretty hostname, and
+ * just set the passed hostname as static/dynamic
+ * hostname. */
+
+ if (hostname_is_valid(hostname))
+ p = "";
+ else {
+ p = hostname;
+
+ h = strdup(hostname);
+ if (!h)
+ return log_oom();
+
+ hostname = hostname_simplify(h);
+ }
+
r = bus_method_call_with_reply(
bus,
"org.freedesktop.hostname1",
r = bus_method_call_with_reply(
bus,
"org.freedesktop.hostname1",
"SetPrettyHostname",
&reply,
NULL,
"SetPrettyHostname",
&reply,
NULL,
- DBUS_TYPE_STRING, &hostname,
DBUS_TYPE_BOOLEAN, &interactive,
DBUS_TYPE_INVALID);
if (r < 0)
return r;
DBUS_TYPE_BOOLEAN, &interactive,
DBUS_TYPE_INVALID);
if (r < 0)
return r;
- h = strdup(hostname);
- if (!h)
- return log_oom();
-
- hostname = hostname_simplify(h);
+ dbus_message_unref(reply);
+ reply = NULL;
+
+ dbus_message_unref(reply);
+ reply = NULL;
}
if (arg_set_transient) {
}
if (arg_set_transient) {
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'", strempty(data[PROP_HOSTNAME]));
+ log_info("Changed host name to '%s'", strna(data[PROP_HOSTNAME]));
changed = bus_properties_changed_new(
"/org/freedesktop/hostname1",
changed = bus_properties_changed_new(
"/org/freedesktop/hostname1",
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'", strempty(data[PROP_STATIC_HOSTNAME]));
+ log_info("Changed static host name to '%s'", strna(data[PROP_STATIC_HOSTNAME]));
changed = bus_properties_changed_new(
"/org/freedesktop/hostname1",
changed = bus_properties_changed_new(
"/org/freedesktop/hostname1",
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", strempty(data[k]));
+ k == PROP_CHASSIS ? "chassis" : "icon name", strna(data[k]));
changed = bus_properties_changed_new(
"/org/freedesktop/hostname1",
changed = bus_properties_changed_new(
"/org/freedesktop/hostname1",