summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcontrib/gnunet-suidfix27
-rw-r--r--po/de.po2
-rw-r--r--po/es.po2
-rw-r--r--po/fr.po2
-rw-r--r--po/sv.po2
-rw-r--r--po/vi.po2
-rw-r--r--po/zh_CN.po2
-rw-r--r--src/transport/gnunet-transport.c2
8 files changed, 34 insertions, 7 deletions
diff --git a/contrib/gnunet-suidfix b/contrib/gnunet-suidfix
new file mode 100755
index 000000000..992378966
--- /dev/null
+++ b/contrib/gnunet-suidfix
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# "suidfix" is german and it means something like immediate suicide.
+
+# taken from dangole's lede config.. thx!
+suid_root_helpers="exit nat-server nat-client transport-bluetooth transport-wlan vpn"
+libexec="${GNUNET_PREFIX}/lib/gnunet/libexec"
+
+chmodown_execbin() {
+ if [ -x $1 ]; then
+ if [ "$3" ]; then
+ chown $3 $1 2>/dev/null && chmod $2 $1
+ else
+ chmod $2 $1
+ fi
+ ls -l $1
+ else
+ echo "Missing: $1"
+ fi
+}
+
+for helper in $suid_root_helpers; do
+ chmodown_execbin ${libexec}/gnunet-helper-$helper u+s
+done
+chmodown_execbin ${libexec}/gnunet-helper-dns 4750 root:gnunetdns
+chmodown_execbin ${libexec}/gnunet-service-dns 2750 gnunet:gnunetdns
+
diff --git a/po/de.po b/po/de.po
index d4db75759..03bdd5299 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7666,7 +7666,7 @@ msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
msgstr ""
#: src/transport/gnunet-transport.c:1978
-msgid "disconnect to a peer"
+msgid "disconnect from a peer"
msgstr "Verbindung zu einem Knoten trennen"
#: src/transport/gnunet-transport.c:1981
diff --git a/po/es.po b/po/es.po
index 454e1e534..cc031daf2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7935,7 +7935,7 @@ msgstr "medir cómo de rápido recibimos datos de todos los pares (hasta CTRL-C)
#: src/transport/gnunet-transport.c:1978
#, fuzzy
-msgid "disconnect to a peer"
+msgid "disconnect from a peer"
msgstr "conectar a un par"
#: src/transport/gnunet-transport.c:1981
diff --git a/po/fr.po b/po/fr.po
index 6bf8c1a33..3479212a5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7356,7 +7356,7 @@ msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
msgstr ""
#: src/transport/gnunet-transport.c:1978
-msgid "disconnect to a peer"
+msgid "disconnect from a peer"
msgstr ""
#: src/transport/gnunet-transport.c:1981
diff --git a/po/sv.po b/po/sv.po
index a64532c2a..b448fc116 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7745,7 +7745,7 @@ msgstr ""
#: src/transport/gnunet-transport.c:1978
#, fuzzy
-msgid "disconnect to a peer"
+msgid "disconnect from a peer"
msgstr "Misslyckades att ansluta till gnunetd.\n"
#: src/transport/gnunet-transport.c:1981
diff --git a/po/vi.po b/po/vi.po
index 4ebb3a67d..84f3b040d 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7813,7 +7813,7 @@ msgstr ""
#: src/transport/gnunet-transport.c:1978
#, fuzzy
-msgid "disconnect to a peer"
+msgid "disconnect from a peer"
msgstr "Lỗi kết nối đến gnunetd.\n"
#: src/transport/gnunet-transport.c:1981
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 16b34291d..bce9e7fc7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7517,7 +7517,7 @@ msgstr ""
#: src/transport/gnunet-transport.c:1978
#, fuzzy
-msgid "disconnect to a peer"
+msgid "disconnect from a peer"
msgstr "初始化“%s”服务失败。\n"
#: src/transport/gnunet-transport.c:1981
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
index cbddee905..d7852893c 100644
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -1975,7 +1975,7 @@ main (int argc, char * const *argv)
gettext_noop ("measure how fast we are receiving data from all peers (until CTRL-C)"),
0, &GNUNET_GETOPT_set_one, &benchmark_receive },
{ 'D', "disconnect",
- NULL, gettext_noop ("disconnect to a peer"), 0,
+ NULL, gettext_noop ("disconnect from a peer"), 0,
&GNUNET_GETOPT_set_one, &do_disconnect },
{ 'd', "validation", NULL,
gettext_noop ("print information for all pending validations "),