X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=b10b4b767b63abd19cbcd61922287ad7b4fe4c3e;hp=c9f1b4d44e207f1997eb8ba901ff02a960171a24;hb=9cab3afefa9bfbffe655438c39cefd1be9e26baa;hpb=46835f3eef54d2011ad51d9bef58b35d811c188b diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c index c9f1b4d..b10b4b7 100644 --- a/src/interfaces/hostnamed/hostnamed.c +++ b/src/interfaces/hostnamed/hostnamed.c @@ -29,7 +29,7 @@ #include #include -/* #include */ +#include #include "hostnamed-gen.h" #include "hostnamed.h" @@ -120,9 +120,8 @@ on_handle_set_hostname(Hostname1 *hn1_passed_interf, GVariant *params; gchar *proposed_hostname, *valid_hostname_buf; gboolean policykit_auth, ret; - size_t check_length, bad_length; + size_t check_length; - bad_length = MAXHOSTNAMELEN + 1; proposed_hostname = NULL; ret = FALSE; @@ -131,14 +130,22 @@ on_handle_set_hostname(Hostname1 *hn1_passed_interf, if(proposed_hostname && (valid_hostname_buf = g_hostname_to_ascii(proposed_hostname))) { - check_length = strnlen(proposed_hostname, bad_length); + check_length = strnlen(proposed_hostname, MAXHOSTNAMELEN + 1); - if(check_length < bad_length && !sethostname(proposed_hostname, check_length)) - ret = TRUE; - } + if(check_length > MAXHOSTNAMELEN) + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ENAMETOOLONG", "Hostname string exceeded maximum length."); - hostname1_complete_set_hostname(hn1_passed_interf, invoc); + else if(sethostname(proposed_hostname, check_length)) + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EACCES", "Insufficient permissions to change hostname."); + else { + HOSTNAME = proposed_hostname; + hostname1_set_hostname(hn1_passed_interf, HOSTNAME); + ret = TRUE; + hostname1_complete_set_hostname(hn1_passed_interf, invoc); + } + } + if(proposed_hostname) g_free(proposed_hostname); if(valid_hostname_buf) @@ -188,21 +195,34 @@ on_handle_set_icon_name(Hostname1 *hn1_passed_interf, const gchar * our_get_hostname() { - if(HOSTNAME) + gchar *hostname_buf; + hostname_buf = (gchar *)g_malloc0(MAXHOSTNAMELEN); + + if(gethostname(hostname_buf, MAXHOSTNAMELEN)) + return "localhost.home.network"; /* TODO bomb out here probably */ + + else if(!g_strcmp0(HOSTNAME, hostname_buf)) { + + g_free(hostname_buf); return HOSTNAME; + } - return "localhost"; + g_ptr_array_add(hostnamed_freeable, hostname_buf); + HOSTNAME = hostname_buf; + hostname1_set_hostname(hostnamed_interf, HOSTNAME); + + return HOSTNAME; } const gchar * our_get_static_hostname() { - if(STATIC_HOSTNAME) + if(STATIC_HOSTNAME && g_strcmp0(STATIC_HOSTNAME, "")) return STATIC_HOSTNAME; else if(HOSTNAME) return HOSTNAME; - return "localhost"; + return "localhost.home.network"; } const gchar * @@ -274,8 +294,8 @@ our_get_os_pretty_name() { /* --- end method/property/dbus signal code, begin bus/name handlers --- */ static void hostnamed_on_bus_acquired(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { + const gchar *name, + gpointer user_data) { g_printf("got bus/name, exporting %s's interface...\n", name); @@ -382,13 +402,14 @@ int main() { CHASSIS = ICON = OS_CPENAME = 0; KERN_NAME = KERN_RELEASE = KERN_VERS = 0; + HOSTNAME = STATIC_HOSTNAME = PRETTY_HOSTNAME = NULL; set_signal_handlers(); if(!determine_chassis_and_icon() || !set_uname_properties() || !set_names()) return 1; - hostnamed_loop = g_main_loop_new(NULL, TRUE); + hostnamed_loop = g_main_loop_new(NULL, TRUE); bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM, "org.freedesktop.hostname1", @@ -414,63 +435,50 @@ int main() { gboolean set_names() { - /*gchar *hostname_buf, *ret; + /* (1) set up */ + gchar *hostname_buf, *static_hostname_buf, *pretty_hostname_buf; + GKeyFile *config; size_t hostname_divider; - hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN); - ret = (gchar*) g_malloc0(MAXHOSTNAMELEN); - - g_ptr_array_add(hostnamed_freeable, hostname_buf); - g_ptr_array_add(hostnamed_freeable, ret); - - if(gethostname(hostname_buf, MAXHOSTNAMELEN) || g_strcmp0(hostname_buf, "") == 0) - return "localhost"; - - hostname_divider = strcspn(hostname_buf, "."); - - return strncpy(ret, hostname_buf, hostname_divider);*/ - + hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN); + static_hostname_buf = (gchar*) g_malloc0(4096); + pretty_hostname_buf = (gchar*) g_malloc0(4096); + config = g_key_file_new(); - /*const gchar *pretty_hostname; - const gchar *ret; - - pretty_hostname = our_get_pretty_hostname(); - - if(g_strcmp0(pretty_hostname, "") == 0) - ret = our_get_hostname(); - - else if((ret = g_hostname_to_ascii(pretty_hostname))) { - - g_ptr_array_add(hostnamed_freeable, (gpointer)ret); - return ret; - } - - return ret;*/ - + g_ptr_array_add(hostnamed_freeable, hostname_buf); + g_ptr_array_add(hostnamed_freeable, static_hostname_buf); + g_ptr_array_add(hostnamed_freeable, pretty_hostname_buf); + /* (2) set HOSTNAME */ + if(gethostname(hostname_buf, MAXHOSTNAMELEN) || !g_strcmp0(hostname_buf, "")) + HOSTNAME = "localhost"; - /*GKeyFile *config; - gchar *ret; + HOSTNAME = hostname_buf; - config = g_key_file_new(); + /* this bit gets you the /etc/myname style hostname + hostname_divider = strcspn(hostname_buf, "."); + strncpy(ret, hostname_buf, hostname_divider); */ + /* (3) set PRETTY_HOSTNAME */ if(g_key_file_load_from_file(config, "/etc/systemd_compat.conf", G_KEY_FILE_NONE, NULL) - && (ret = g_key_file_get_value(config, "hostnamed", "PrettyHostname", NULL))) { ret might need to be freed, docs dont specify but i am suspicious - - g_key_file_unref(config); - return ret; - } - + && (pretty_hostname_buf = g_key_file_get_value(config, "hostnamed", "PrettyHostname", NULL))) + PRETTY_HOSTNAME = pretty_hostname_buf; + else + PRETTY_HOSTNAME = ""; + if(config) - g_free(config); - - return "";*/ + g_key_file_unref(config); + /* (4) set STATIC_HOSTNAME */ + if(!g_strcmp0(PRETTY_HOSTNAME, "")) + STATIC_HOSTNAME = HOSTNAME; + else if((static_hostname_buf = g_hostname_to_ascii(PRETTY_HOSTNAME))) + STATIC_HOSTNAME = static_hostname_buf; + return (HOSTNAME && STATIC_HOSTNAME && PRETTY_HOSTNAME) ? TRUE : FALSE; - return FALSE; /* temp */ } gboolean set_uname_properties() {