1 files changed, 90 insertions, 13 deletions

diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index 27b95cfd..a3d0af10 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -26,7 +26,9 @@
 
 #include "platform.h"
 #include "gnunetgtk_common.h"
+#include <GNUnet/gnunet_directories.h>
 #include <GNUnet/gnunet_getoption_lib.h>
+#include <GNUnet/gnunet_util_config_impl.h>
 #include <GNUnet/gnunet_util_cron.h>
 #include <GNUnet/gnunet_util_network_client.h>
 #include <gtk/gtk.h>
@@ -114,9 +116,16 @@ static void * doUpdateMenus(void * arg) {
   static GtkWidget * launchEntry = NULL;
   static GtkWidget * statsEntryYes = NULL;
   static GtkWidget * statsEntryNo = NULL;
+  static GtkWidget * statsEntryError = NULL;
+  static GtkWidget * chooser = NULL;
   static int once = 1;
   static int isLocal;
   char * host;
+  int canStart;
+  struct GC_Configuration * dcfg;
+  char * fn;
+  char * user;
+  struct passwd * pws;
 
   if (once) {
     once = 0;
@@ -132,6 +141,12 @@ static void * doUpdateMenus(void * arg) {
     statsEntryNo
       = glade_xml_get_widget(getMainXML(),
                              "statusPixmapNo");
+    statsEntryError
+      = glade_xml_get_widget(getMainXML(),
+                             "statusPixmapError");
+    chooser 
+      = glade_xml_get_widget(getMainXML(),
+                             "gnunetdconfigFileChooserButton");
     GC_get_configuration_value_string(cfg,
                                       "NETWORK",
                                       "HOST",
@@ -141,16 +156,53 @@ static void * doUpdateMenus(void * arg) {
       isLocal = TRUE;
     else
       isLocal = FALSE;
-    FREENONNULL(host);
+    FREE(host);
   }
   updateAppModelSafe(NULL);
-  if (ret == SYSERR) {
+  if (ret == 0) {
+    canStart = 0;
+    if ( (isLocal) &&
+         (NULL != (fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser)))) ) {
+      if (disk_file_test(ectx, fn) == YES) {
+        dcfg = GC_create_C_impl();
+        canStart = 1;
+        if (0 != GC_parse_configuration(dcfg, fn))
+          canStart = 0;
+        user = NULL;
+        GC_get_configuration_value_string(dcfg,
+                                          "GNUNETD",
+                                          "USER",
+                                          "",
+                                          &user);
+        if (strlen(user) > 0) {
+          if (NULL == (pws = getpwnam(user))) {
+            canStart = 0;
+          } else {
+            if (pws->pw_uid != getuid())
+              canStart = (geteuid() == 0);
+            else
+              canStart = 1;
+          }
+        }
+        FREE(user);
+        GC_free(dcfg);
+      }    
+      g_free(fn);
+    } 
     gtk_widget_hide(statsEntryYes);
-    gtk_widget_show_all(statsEntryNo);
     gtk_widget_set_sensitive(killEntry, FALSE);
-    gtk_widget_set_sensitive(launchEntry, (TRUE & isLocal) );
+    if (canStart && isLocal) {
+      gtk_widget_set_sensitive(launchEntry, TRUE);
+      gtk_widget_show_all(statsEntryNo);
+      gtk_widget_hide(statsEntryError);
+    } else {
+      gtk_widget_set_sensitive(launchEntry, FALSE);
+      gtk_widget_show_all(statsEntryError);
+      gtk_widget_hide(statsEntryNo);
+    }
   } else {
     gtk_widget_hide(statsEntryNo);
+    gtk_widget_hide(statsEntryError);
     gtk_widget_show_all(statsEntryYes);
     gtk_widget_set_sensitive(killEntry, TRUE);
     gtk_widget_set_sensitive(launchEntry, FALSE);
@@ -159,15 +211,14 @@ static void * doUpdateMenus(void * arg) {
 }
 
 static void cronCheckDaemon(void * dummy) {
-  static int last = 42;
   int ret;
 
-  ret = connection_test_running(ectx,
-                                cfg);
-  if (ret != last) {
-    last = ret;
-    gtkSaveCall(&doUpdateMenus, &ret);
-  }
+  if (OK == connection_test_running(ectx,
+                                    cfg))
+    ret = 1;
+  else
+    ret = 0;
+  gtkSaveCall(&doUpdateMenus, &ret);  
 }
 
 
@@ -177,7 +228,9 @@ static void cronCheckDaemon(void * dummy) {
 void on_startDaemon_clicked_daemon(GtkWidget * widget,
                                    gpointer data) {
   GtkWidget * launchEntry;
-
+  GtkWidget * chooser;
+  char * fn;
+ 
   launchEntry
     = glade_xml_get_widget(getMainXML(),
                            "startDaemon");
@@ -188,14 +241,21 @@ void on_startDaemon_clicked_daemon(GtkWidget * widget,
     return;
   } else {      
     addLogEntry(_("Launching gnunetd..."));
+    chooser 
+      = glade_xml_get_widget(getMainXML(),
+                             "gnunetdconfigFileChooserButton");
+    fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser));
+    GE_BREAK(ectx, fn != NULL);
     if (SYSERR != os_daemon_start(ectx,
                                   cfg,
-                                  NULL, /* fixme: cfgFile */
+                                  fn, 
                                   YES)) {
       addLogEntry(_("Launched gnunetd"));
     } else {
       addLogEntry(_("Launching gnunetd failed"));
     }
+    if (fn != NULL)
+      g_free(fn);
   }
 }
 
@@ -242,6 +302,7 @@ void init_daemon(struct GE_Context * e,
   GtkListStore * model;
   GtkCellRenderer * renderer;
   int col;
+  char * daemon_config;
 
   ectx = e;
   cfg = c;
@@ -277,6 +338,22 @@ void init_daemon(struct GE_Context * e,
     = glade_xml_get_widget(getMainXML(),
                            "daemonScrolledWindow");
   gtk_widget_show(tab);
+  daemon_config = NULL;
+  GC_get_configuration_value_filename(cfg,
+                                      "DAEMON",
+                                      "CONFIGFILE",
+                                      DEFAULT_DAEMON_CONFIG_FILE,
+                                      &daemon_config);
+  if (YES == disk_file_test(NULL, daemon_config)) {
+    gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(glade_xml_get_widget(getMainXML(),
+                                                                        "gnunetdconfigFileChooserButton")),
+                                  daemon_config);
+  } else {
+    addLogEntry(_("Configuration file for GNUnet daemon `%s' does not exist! Run `gnunet-setup -d'."),
+                daemon_config);
+  }
+  FREE(daemon_config);
+  
   cron = cron_create(ectx);
   cron_add_job(cron,
                &cronCheckDaemon,