[GNUnet-SVN] r37425 - in gnunet: contrib po src/transport

[gnunet]

Author: lynx
Date: 2016-06-29 23:50:20 +0200 (Wed, 29 Jun 2016)
New Revision: 37425

Added:
   gnunet/contrib/gnunet-suidfix
Modified:
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/fr.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/transport/gnunet-transport.c
Log:
Merge remote-tracking branch 'origin/master'

Added: gnunet/contrib/gnunet-suidfix
===================================================================
--- gnunet/contrib/gnunet-suidfix                               (rev 0)
+++ gnunet/contrib/gnunet-suidfix       2016-06-29 21:50:20 UTC (rev 37425)
@@ -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
+


Property changes on: gnunet/contrib/gnunet-suidfix
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2016-06-29 20:19:03 UTC (rev 37424)
+++ gnunet/po/de.po     2016-06-29 21:50:20 UTC (rev 37425)
@@ -7666,7 +7666,7 @@
 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

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2016-06-29 20:19:03 UTC (rev 37424)
+++ gnunet/po/es.po     2016-06-29 21:50:20 UTC (rev 37425)
@@ -7935,7 +7935,7 @@
 
 #: 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

Modified: gnunet/po/fr.po
===================================================================
--- gnunet/po/fr.po     2016-06-29 20:19:03 UTC (rev 37424)
+++ gnunet/po/fr.po     2016-06-29 21:50:20 UTC (rev 37425)
@@ -7356,7 +7356,7 @@
 msgstr ""
 
 #: src/transport/gnunet-transport.c:1978
-msgid "disconnect to a peer"
+msgid "disconnect from a peer"
 msgstr ""
 
 #: src/transport/gnunet-transport.c:1981

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2016-06-29 20:19:03 UTC (rev 37424)
+++ gnunet/po/sv.po     2016-06-29 21:50:20 UTC (rev 37425)
@@ -7745,7 +7745,7 @@
 
 #: 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

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2016-06-29 20:19:03 UTC (rev 37424)
+++ gnunet/po/vi.po     2016-06-29 21:50:20 UTC (rev 37425)
@@ -7813,7 +7813,7 @@
 
 #: 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

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2016-06-29 20:19:03 UTC (rev 37424)
+++ gnunet/po/zh_CN.po  2016-06-29 21:50:20 UTC (rev 37425)
@@ -7517,7 +7517,7 @@
 
 #: 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

Modified: gnunet/src/transport/gnunet-transport.c
===================================================================
--- gnunet/src/transport/gnunet-transport.c     2016-06-29 20:19:03 UTC (rev 
37424)
+++ gnunet/src/transport/gnunet-transport.c     2016-06-29 21:50:20 UTC (rev 
37425)
@@ -1975,7 +1975,7 @@
       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 "),