X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=19a196cc62929b2cdd346176a9b94ed7c267580f;hb=63cf6e7e9a47eb51553f4c0f61d72639dbe7987b;hp=c9f1b4d44e207f1997eb8ba901ff02a960171a24;hpb=e51864d107f420547cea1246cf4e2c71d992562d;p=systembsd.git

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index c9f1b4d..19a196c 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -29,7 +29,7 @@
 
 #include <glib/gprintf.h>
 #include <glib-unix.h>
-/* #include <gtk/gtk.h> */
+#include <polkit/polkit.h>
 
 #include "hostnamed-gen.h"
 #include "hostnamed.h"
@@ -137,7 +137,8 @@ on_handle_set_hostname(Hostname1 *hn1_passed_interf,
             ret = TRUE;
     }
 
-    hostname1_complete_set_hostname(hn1_passed_interf, invoc);
+    if(ret)
+        hostname1_complete_set_hostname(hn1_passed_interf, invoc);
 
     if(proposed_hostname)
         g_free(proposed_hostname);
@@ -382,13 +383,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 +416,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);
+    hostname_buf        = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+    static_hostname_buf = (gchar*) g_malloc0(4096);
+    pretty_hostname_buf = (gchar*) g_malloc0(4096);
 
-    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);*/
-
-
-
-    /*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;*/
+    config = g_key_file_new();
 
+    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() {