-use fork exec instead libgksu due to gtk2.0/gtk3.0 incompatibility

1 files changed, 21 insertions, 32 deletions

diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index d41be339..88210d21 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -23,17 +23,15 @@
  * @brief Main function of gnunet-setup
  * @author Christian Grothoff
  */
-#if ENABLE_NLS
-#include <locale.h>
-#endif
-#if HAVE_LIBGKSU_LIBGKSU_H
-#include <libgksu/gksu.h>
-#endif
 #include "gnunet-setup.h"
 #include "gnunet-setup-options.h"
 #include "gnunet-setup-gns.h"
 #include <gnunet/gnunet_constants.h>
 #include <regex.h>
+#if ENABLE_NLS
+#include <locale.h>
+#endif
+
 
 /**
  * Main loop handle.
@@ -65,12 +63,11 @@ static struct GNUNET_OS_Process *resolver;
  */
 static struct GNUNET_OS_Process *namestore;
 
-#if HAVE_LIBGKSU_LIBGKSU_H
 /**
- * Flag to emable privilege escalation.
+ * Flag to enable privilege escalation.
  */
 static int do_gksu;
-#endif
+
 
 /**
  * Show all configuration options, even if we are run
@@ -441,7 +438,6 @@ start_namestore (void *cls,
 }
 
 
-#if HAVE_LIBGKSU_LIBGKSU_H
 /**
  * Try elevating user priviledges to run as user 'gnunet' or 'root'.
  *
@@ -451,23 +447,22 @@ start_namestore (void *cls,
 static int
 try_gksu (const char *username)
 {
-  GksuContext *gksu;
-  GError *err;
-  
-  gksu = gksu_context_new ();
-  gksu_context_set_user (gksu, username);
-  gksu_context_set_command (gksu, "gnunet-setup");
-  gksu_context_set_description (gksu, _("Elevate priviledges to setup GNUnet on the host"));
-  gksu_context_set_message (gksu, _("Enter password to run gnunet-setup as user 'gnunet'"));
-  if (gksu_run_full (gksu,
-                     NULL, NULL,
-                     NULL, NULL,
-                     &err))
-    return GNUNET_OK;
-  g_object_unref (err);
-  return GNUNET_SYSERR;
+  struct GNUNET_OS_Process *proc;
+
+  proc = GNUNET_OS_start_process (GNUNET_NO,
+                                  GNUNET_OS_INHERIT_STD_ALL,
+                                  NULL, NULL,
+                                  "gksu",
+                                  "-u", username,
+                                  "-D", _("Elevate priviledges to setup GNUnet on the host"),
+                                  "-m", _("Enter password to run gnunet-setup as user 'gnunet'"),
+                                  NULL);
+  if (NULL == proc)
+    return GNUNET_SYSERR;
+  GNUNET_OS_process_wait (proc);
+  GNUNET_OS_process_destroy (proc);
+  return GNUNET_OK;
 }
-#endif
 
 
 /**
@@ -485,8 +480,6 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   my_uid = getuid ();
   gnunet_pw = getpwnam ("gnunet");
-#if HAVE_LIBGKSU_LIBGKSU_H
-
   if ( (0 != do_gksu) &&
        (0 != my_uid) &&
        (NULL != gnunet_pw) &&
@@ -496,8 +489,6 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_GTK_main_loop_quit (cls);
     return;
   }
-#endif  
-
   ml = cls;
   if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (ml, NULL))
     return;
@@ -564,11 +555,9 @@ int
 main (int argc, char *const *argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
-#if HAVE_LIBGKSU_LIBGKSU_H
     { 'e', "elevate-priviledges", NULL,
       gettext_noop ("run as user 'gnunet', if necessary by executing gksu to elevate rights"),
       0, &GNUNET_GETOPT_set_one, &do_gksu },
-#endif
     { 'f', "force-full-setup", NULL,
       gettext_noop ("force showing the full set of options, even if gnunet-setup is run as a normal user and as a user 'gnunet' exists on the system, most options should not apply to the normal user as GNUnet should be run by the 'gnunet' user"),
       0, &GNUNET_GETOPT_set_one, &force_full_setup },