Merge remote-tracking branch 'origin/master'

diff --git a/contrib/gnunet-suidfix b/contrib/gnunet-suidfix
new file mode 100755 (executable)
index 0000000..9923789
--- /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 d4db75759d761db49b776cdc7bf7666b1cb90124..03bdd5299b315efc43dc3ed5a63a3558d4baae9a 100644 (file)
--- 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 454e1e534cd0d96ee11d80cde8f8367aeb8a9cd7..cc031daf2b2562004e8a948f3d784ed260ee412f 100644 (file)
--- 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 6bf8c1a333eec51150856a2fb89a443ea1085167..3479212a58205488cda59fe5f0f539614ddba258 100644 (file)
--- 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 a64532c2a3a3e50786d4a47c5db68ca5ee2cac88..b448fc11638bf1cd0320097bc4bb097795ef7db9 100644 (file)
--- 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 4ebb3a67d256f3accd7786d7f830090aeae734a5..84f3b040d1d9c9f1ba6bb93b8d0c159270adaea6 100644 (file)
--- 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 16b34291d378d2d63de548693d31ff905ac86234..bce9e7fc7778bbee5a99259e5109e5f24bdb25a5 100644 (file)
--- 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 cbddee9055345b033abe53978c3ca0ec66f4e416..d7852893c4145d7f42d0abf4711e22ac9f4e9acd 100644 (file)
--- 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 "),