aboutsummaryrefslogtreecommitdiff
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 @@
1#!/bin/sh
2#
3# "suidfix" is german and it means something like immediate suicide.
4
5# taken from dangole's lede config.. thx!
6suid_root_helpers="exit nat-server nat-client transport-bluetooth transport-wlan vpn"
7libexec="${GNUNET_PREFIX}/lib/gnunet/libexec"
8
9chmodown_execbin() {
10 if [ -x $1 ]; then
11 if [ "$3" ]; then
12 chown $3 $1 2>/dev/null && chmod $2 $1
13 else
14 chmod $2 $1
15 fi
16 ls -l $1
17 else
18 echo "Missing: $1"
19 fi
20}
21
22for helper in $suid_root_helpers; do
23 chmodown_execbin ${libexec}/gnunet-helper-$helper u+s
24done
25chmodown_execbin ${libexec}/gnunet-helper-dns 4750 root:gnunetdns
26chmodown_execbin ${libexec}/gnunet-service-dns 2750 gnunet:gnunetdns
27
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)"
7666msgstr "" 7666msgstr ""
7667 7667
7668#: src/transport/gnunet-transport.c:1978 7668#: src/transport/gnunet-transport.c:1978
7669msgid "disconnect to a peer" 7669msgid "disconnect from a peer"
7670msgstr "Verbindung zu einem Knoten trennen" 7670msgstr "Verbindung zu einem Knoten trennen"
7671 7671
7672#: src/transport/gnunet-transport.c:1981 7672#: 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)
7935 7935
7936#: src/transport/gnunet-transport.c:1978 7936#: src/transport/gnunet-transport.c:1978
7937#, fuzzy 7937#, fuzzy
7938msgid "disconnect to a peer" 7938msgid "disconnect from a peer"
7939msgstr "conectar a un par" 7939msgstr "conectar a un par"
7940 7940
7941#: src/transport/gnunet-transport.c:1981 7941#: 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)"
7356msgstr "" 7356msgstr ""
7357 7357
7358#: src/transport/gnunet-transport.c:1978 7358#: src/transport/gnunet-transport.c:1978
7359msgid "disconnect to a peer" 7359msgid "disconnect from a peer"
7360msgstr "" 7360msgstr ""
7361 7361
7362#: src/transport/gnunet-transport.c:1981 7362#: 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 ""
7745 7745
7746#: src/transport/gnunet-transport.c:1978 7746#: src/transport/gnunet-transport.c:1978
7747#, fuzzy 7747#, fuzzy
7748msgid "disconnect to a peer" 7748msgid "disconnect from a peer"
7749msgstr "Misslyckades att ansluta till gnunetd.\n" 7749msgstr "Misslyckades att ansluta till gnunetd.\n"
7750 7750
7751#: src/transport/gnunet-transport.c:1981 7751#: 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 ""
7813 7813
7814#: src/transport/gnunet-transport.c:1978 7814#: src/transport/gnunet-transport.c:1978
7815#, fuzzy 7815#, fuzzy
7816msgid "disconnect to a peer" 7816msgid "disconnect from a peer"
7817msgstr "Lỗi kết nối đến gnunetd.\n" 7817msgstr "Lỗi kết nối đến gnunetd.\n"
7818 7818
7819#: src/transport/gnunet-transport.c:1981 7819#: 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 ""
7517 7517
7518#: src/transport/gnunet-transport.c:1978 7518#: src/transport/gnunet-transport.c:1978
7519#, fuzzy 7519#, fuzzy
7520msgid "disconnect to a peer" 7520msgid "disconnect from a peer"
7521msgstr "初始化“%s”服务失败。\n" 7521msgstr "初始化“%s”服务失败。\n"
7522 7522
7523#: src/transport/gnunet-transport.c:1981 7523#: 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)
1975 gettext_noop ("measure how fast we are receiving data from all peers (until CTRL-C)"), 1975 gettext_noop ("measure how fast we are receiving data from all peers (until CTRL-C)"),
1976 0, &GNUNET_GETOPT_set_one, &benchmark_receive }, 1976 0, &GNUNET_GETOPT_set_one, &benchmark_receive },
1977 { 'D', "disconnect", 1977 { 'D', "disconnect",
1978 NULL, gettext_noop ("disconnect to a peer"), 0, 1978 NULL, gettext_noop ("disconnect from a peer"), 0,
1979 &GNUNET_GETOPT_set_one, &do_disconnect }, 1979 &GNUNET_GETOPT_set_one, &do_disconnect },
1980 { 'd', "validation", NULL, 1980 { 'd', "validation", NULL,
1981 gettext_noop ("print information for all pending validations "), 1981 gettext_noop ("print information for all pending validations "),