X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=c9f1b4d44e207f1997eb8ba901ff02a960171a24;hp=52a419b3564bb3e9ac67011545e5f4818a55e1b8;hb=46835f3eef54d2011ad51d9bef58b35d811c188b;hpb=5b70f403d2cfb721bb59bbbc4e42d65c251c9b22

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 52a419b..c9f1b4d 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -79,9 +79,9 @@ GMainLoop *hostnamed_loop;
 guint bus_descriptor;
 gboolean dbus_interface_exported; /* reliable because of gdbus operational guarantees */
 
+gchar *HOSTNAME, *STATIC_HOSTNAME, *PRETTY_HOSTNAME;
 gchar *CHASSIS, *ICON;
-gchar *OS_CPENAME;
-gchar *KERN_NAME, *KERN_RELEASE, *KERN_VERS;
+gchar *KERN_NAME, *KERN_RELEASE, *KERN_VERS, *OS_CPENAME;
 
 /* TODO no specific vm or laptop icon in gnome
  * NOTE paravirtualization on xen is only available for linuxes right now
@@ -188,60 +188,28 @@ on_handle_set_icon_name(Hostname1 *hn1_passed_interf,
 const gchar *
 our_get_hostname() {
 
-    gchar *hostname_buf, *ret;
-    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, ".");
+    if(HOSTNAME)
+        return HOSTNAME;
 
-    return strncpy(ret, hostname_buf, hostname_divider);
+    return "localhost";
 }
 
 const gchar *
 our_get_static_hostname() {
 
-    const gchar *pretty_hostname;
-    const gchar *ret;
-
-    pretty_hostname = our_get_pretty_hostname();
-
-    if(g_strcmp0(pretty_hostname, "") == 0)
-        ret = our_get_hostname();
+    if(STATIC_HOSTNAME)
+        return STATIC_HOSTNAME;
+    else if(HOSTNAME)
+        return HOSTNAME;
 
-    else if((ret = g_hostname_to_ascii(pretty_hostname))) {
-
-        g_ptr_array_add(hostnamed_freeable, (gpointer)ret);
-        return ret;
-    }
-
-    return ret;
+    return "localhost";
 }
 
 const gchar *
 our_get_pretty_hostname() {
 
-    GKeyFile *config;
-    gchar *ret;
-
-    config = g_key_file_new();
-
-    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;
-    }
-
-    if(config)
-        g_free(config);
+    if(PRETTY_HOSTNAME)
+        return PRETTY_HOSTNAME;
 
     return "";
 }
@@ -252,7 +220,7 @@ our_get_chassis() {
    if(CHASSIS)
         return CHASSIS;
 
-    return "desktop";
+    return "desktop"; /* this leads to the most generic beheivor in the unlikely case its returned */
 }
 
 const gchar *
@@ -417,7 +385,7 @@ int main() {
  
     set_signal_handlers();
 
-    if(!determine_chassis_and_icon() || !set_uname_properties())
+    if(!determine_chassis_and_icon() || !set_uname_properties() || !set_names())
         return 1;
     
     hostnamed_loop     = g_main_loop_new(NULL, TRUE);
@@ -444,6 +412,67 @@ int main() {
     return 0;
 }
 
+gboolean set_names() {
+
+    /*gchar *hostname_buf, *ret;
+    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);*/
+
+
+
+    /*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;*/
+
+
+
+  /*GKeyFile *config;
+    gchar *ret;
+
+    config = g_key_file_new();
+
+    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;
+    }
+
+    if(config)
+        g_free(config);
+
+    return "";*/
+
+
+
+
+    return FALSE; /* temp */
+}
+
 gboolean set_uname_properties() {
 
     struct utsname un;