diff options
| -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 0000000000..9923789662 --- /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 + @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 16b34291d3..bce9e7fc77 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 cbddee9055..d7852893c4 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 "), |