1 files changed, 3 insertions, 27 deletions

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 */
 
   {