From dae47540545837ae84db5f6bf5713210df77236d Mon Sep 17 00:00:00 2001 From: Claudio-Daniel Freire Date: Tue, 10 May 2011 10:53:52 +0200 Subject: [PATCH] Properly handle linux abstract socket names --- src/nepi/testbeds/planetlab/tunproto.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nepi/testbeds/planetlab/tunproto.py b/src/nepi/testbeds/planetlab/tunproto.py index 7a340a8b..411d5e92 100644 --- a/src/nepi/testbeds/planetlab/tunproto.py +++ b/src/nepi/testbeds/planetlab/tunproto.py @@ -144,9 +144,9 @@ class TunProtoBase(object): if check_proto == 'fd': passfd_arg = str(peer_addr) - if '\x00' in passfd_arg: + if passfd_arg.startswith('\x00'): # cannot shell_encode null characters :( - passfd_arg = "base64:"+base64.b64encode('$HOME/'+passfd_arg) + passfd_arg = "base64:"+base64.b64encode(passfd_arg) else: passfd_arg = '$HOME/'+server.shell_escape(passfd_arg) args.extend([ -- 2.47.0