-make options in gnunet-setup match those that the code actually uses

4 files changed, 10 insertions, 119 deletions

diff --git a/contrib/gnunet_setup_main_window.glade b/contrib/gnunet_setup_main_window.glade
index 476d4011..bec6406e 100644
--- a/contrib/gnunet_setup_main_window.glade
+++ b/contrib/gnunet_setup_main_window.glade
@@ -4317,48 +4317,6 @@
                     <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="GNUNET_setup_gns_alignment">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkVBox" id="GNUNET_setup_gns_option_vbox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkCheckButton" id="GNUNET_setup_gns_hijack_checkbutton">
-                                <property name="label" translatable="yes">Enable iptables-based DNS hijacking (GNU/Linux-only)</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="padding">5</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="GNUNET_setup_gns_auto_import_checkbutton">
-                                <property name="label" translatable="yes">Enable automatic shortening</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
                     <child type="label">
                       <object class="GtkLabel" id="GNUNET_setup_gns_option_label">
                         <property name="visible">True</property>
diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index 9495e824..2eae2b90 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -1904,7 +1904,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
    "GNUNET_setup_vpn_interface_v6_mask_spinbutton",
    "value-changed",
    "vpn",
-   "IPV6MASK",
+   "IPV6PREFIX",
    gettext_noop ("IPv6 network prefix length to use for the VPN interface"),
    "https://gnunet.org/configuration-vpn",
    &load_number,
@@ -1958,7 +1958,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
    "GNUNET_setup_exit_interface_name_entry",
    "changed",
    "exit",
-   "IFNAME",
+   "TUN_IFNAME",
    gettext_noop
    ("Name of the virtual interface the GNUnet exit service should create for traffic exiting the VPN to the Internet"),
    "https://gnunet.org/configuration-exit",
@@ -2007,7 +2007,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
    "GNUNET_setup_exit_interface_v6_mask_spinbutton",
    "value-changed",
    "exit",
-   "IPV6MASK",
+   "IPV6PREFIX",
    gettext_noop
    ("IPv6 network prefix length to use for the Exit interface"),
    "https://gnunet.org/configuration-exit",
@@ -2128,30 +2128,6 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
    hide_gns_tabs},
 
 
-  {
-   "GNUNET_setup_gns_hijack_checkbutton",
-   "toggled",
-   "gns",
-   "HIJACK_DNS",
-   gettext_noop ("Should DNS queries be intercepted using iptables?"),
-   "https://gnunet.org/gnunet-dns-setup",
-   &load_yes_no,
-   &save_yes_no, NULL,
-   NULL, NULL,
-   NULL},
-
-  {
-   "GNUNET_setup_gns_auto_import_checkbutton",
-   "toggled",
-   "gns",
-   "AUTO_IMPORT_PKEY",
-   gettext_noop ("Should names be automatically learned and placed into the 'shorten' Zone?"),
-   "https://gnunet.org/configuration-gns-shortening",
-   &load_yes_no,
-   &save_yes_no, NULL,
-   NULL, NULL,
-   NULL},
-
   /* EXIT services */
 
   {
diff --git a/src/setup/gnunet-setup-transport-test.c b/src/setup/gnunet-setup-transport-test.c
index 6f885a43..5a539bc7 100644
--- a/src/setup/gnunet-setup-transport-test.c
+++ b/src/setup/gnunet-setup-transport-test.c
@@ -107,7 +107,7 @@ display_test_result (struct TestContext *tc, int result)
  * Clean up and update GUI (with success).
  *
  * @param cls test context
- * @param success currently always GNUNET_OK
+ * @param success currently always #GNUNET_OK
  */
 static void
 result_callback (void *cls, int success)
@@ -140,7 +140,7 @@ fail_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * transport configuration.
  *
  * @param section_name section with the port numbers
- * @param is_tcp GNUNET_YES for TCP, GNUNET_NO for UDP
+ * @param is_tcp #GNUNET_YES for TCP, #GNUNET_NO for UDP
  * @param success_image image to show on success
  * @param failure_image image to show on failure
  */
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 547f7441..1f5bc0a4 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -330,7 +330,7 @@ load_options ()
 /**
  * Write final configuration to disk.
  *
- * @return GNUNET_OK on success
+ * @return #GNUNET_OK on success
  */
 static int
 write_configuration ()
@@ -602,54 +602,11 @@ run (void *cls,
 
   option_cfg_name = GNUNET_GTK_main_loop_get_configuration_file (ml);
   cfg = GNUNET_CONFIGURATION_create ();
-
-#ifndef MINGW
-  if ( (0 != my_uid) &&
-       (NULL != gnunet_pw) &&
-       (my_uid != gnunet_pw->pw_uid) )
-  {
-    /* load system defaults, system/'gnunet' user's configuration and THEN
-       our configuration file */
-    if (GNUNET_YES ==
-        GNUNET_DISK_file_test ("/etc/gnunet.conf"))
-    {
-      (void) GNUNET_CONFIGURATION_load (cfg, "/etc/gnunet.conf");
-    }
-    else
-    {
-#if HAVE_GETPWNAM
-      struct passwd *pw;
-
-      pw = getpwnam ("gnunet");
-      if (NULL != pw)
-      {
-        char *gnunet_user_cfgname;
-
-        GNUNET_asprintf (&gnunet_user_cfgname,
-                         "%s%s%s",
-                         pw->pw_dir,
-                         DIR_SEPARATOR_STR,
-                         ".config/gnunet.conf");
-        if (GNUNET_YES ==
-            GNUNET_DISK_file_test (gnunet_user_cfgname))
-          (void) GNUNET_CONFIGURATION_load (cfg, gnunet_user_cfgname);
-        GNUNET_free (gnunet_user_cfgname);
-      }
-#endif
-    }
-    if (GNUNET_YES ==
-        GNUNET_DISK_file_test (option_cfg_name))
-      (void) GNUNET_CONFIGURATION_parse (cfg,
-                                         option_cfg_name);
-  }
-  else
-#endif
-  {
-    /* only load system defaults and our configuration file */
-    if (GNUNET_YES ==
-        GNUNET_DISK_file_test (option_cfg_name))
+  if (GNUNET_YES ==
+      GNUNET_DISK_file_test (option_cfg_name))
     (void) GNUNET_CONFIGURATION_load (cfg, option_cfg_name);
-  }
+  else
+    (void) GNUNET_CONFIGURATION_load (cfg, NULL);
   main_window = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_dialog"));
   main_window = GNUNET_GTK_plug_me ("GNUNET_FS_GTK_PLUG",
                                     main_window);