diff options
author | Carlo von lynX <lynX@time.to.get.psyced.org> | 2016-06-29 21:50:20 +0000 |
---|---|---|
committer | Carlo von lynX <lynX@time.to.get.psyced.org> | 2016-06-29 21:50:20 +0000 |
commit | d81be51faaee398c282356248e3ce1a36d0b46da (patch) | |
tree | 3871b03a2ec1f0f7cf2ff1ccea5d9e02b8f3ed74 | |
parent | ec2cba064ca7de430c27a5e979940a937e7dd9b7 (diff) | |
download | gnunet-d81be51faaee398c282356248e3ce1a36d0b46da.tar.gz gnunet-d81be51faaee398c282356248e3ce1a36d0b46da.zip |
Merge remote-tracking branch 'origin/master'
-rwxr-xr-x | contrib/gnunet-suidfix | 27 | ||||
-rw-r--r-- | po/de.po | 2 | ||||
-rw-r--r-- | po/es.po | 2 | ||||
-rw-r--r-- | po/fr.po | 2 | ||||
-rw-r--r-- | po/sv.po | 2 | ||||
-rw-r--r-- | po/vi.po | 2 | ||||
-rw-r--r-- | po/zh_CN.po | 2 | ||||
-rw-r--r-- | src/transport/gnunet-transport.c | 2 |
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! | ||
6 | suid_root_helpers="exit nat-server nat-client transport-bluetooth transport-wlan vpn" | ||
7 | libexec="${GNUNET_PREFIX}/lib/gnunet/libexec" | ||
8 | |||
9 | chmodown_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 | |||
22 | for helper in $suid_root_helpers; do | ||
23 | chmodown_execbin ${libexec}/gnunet-helper-$helper u+s | ||
24 | done | ||
25 | chmodown_execbin ${libexec}/gnunet-helper-dns 4750 root:gnunetdns | ||
26 | chmodown_execbin ${libexec}/gnunet-service-dns 2750 gnunet:gnunetdns | ||
27 | |||
@@ -7666,7 +7666,7 @@ msgid "measure how fast we are receiving data from all peers (until CTRL-C)" | |||
7666 | msgstr "" | 7666 | msgstr "" |
7667 | 7667 | ||
7668 | #: src/transport/gnunet-transport.c:1978 | 7668 | #: src/transport/gnunet-transport.c:1978 |
7669 | msgid "disconnect to a peer" | 7669 | msgid "disconnect from a peer" |
7670 | msgstr "Verbindung zu einem Knoten trennen" | 7670 | msgstr "Verbindung zu einem Knoten trennen" |
7671 | 7671 | ||
7672 | #: src/transport/gnunet-transport.c:1981 | 7672 | #: src/transport/gnunet-transport.c:1981 |
@@ -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 |
7938 | msgid "disconnect to a peer" | 7938 | msgid "disconnect from a peer" |
7939 | msgstr "conectar a un par" | 7939 | msgstr "conectar a un par" |
7940 | 7940 | ||
7941 | #: src/transport/gnunet-transport.c:1981 | 7941 | #: src/transport/gnunet-transport.c:1981 |
@@ -7356,7 +7356,7 @@ msgid "measure how fast we are receiving data from all peers (until CTRL-C)" | |||
7356 | msgstr "" | 7356 | msgstr "" |
7357 | 7357 | ||
7358 | #: src/transport/gnunet-transport.c:1978 | 7358 | #: src/transport/gnunet-transport.c:1978 |
7359 | msgid "disconnect to a peer" | 7359 | msgid "disconnect from a peer" |
7360 | msgstr "" | 7360 | msgstr "" |
7361 | 7361 | ||
7362 | #: src/transport/gnunet-transport.c:1981 | 7362 | #: src/transport/gnunet-transport.c:1981 |
@@ -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 |
7748 | msgid "disconnect to a peer" | 7748 | msgid "disconnect from a peer" |
7749 | msgstr "Misslyckades att ansluta till gnunetd.\n" | 7749 | msgstr "Misslyckades att ansluta till gnunetd.\n" |
7750 | 7750 | ||
7751 | #: src/transport/gnunet-transport.c:1981 | 7751 | #: src/transport/gnunet-transport.c:1981 |
@@ -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 |
7816 | msgid "disconnect to a peer" | 7816 | msgid "disconnect from a peer" |
7817 | msgstr "Lỗi kết nối đến gnunetd.\n" | 7817 | msgstr "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 |
7520 | msgid "disconnect to a peer" | 7520 | msgid "disconnect from a peer" |
7521 | msgstr "初始化“%s”服务失败。\n" | 7521 | msgstr "初始化“%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 "), |