From 48cdd60e02e33a6eeabaa002e1ac269ed9a2b83e Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Sat, 24 Aug 2013 23:23:25 +0200
Subject: Fixing handling of parameters with spaces in torsocks/torify

---
 modules/services/security/torify.nix   | 4 ++--
 modules/services/security/torsocks.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/services/security/torify.nix b/modules/services/security/torify.nix
index b91d7d58505c..1c158906a911 100644
--- a/modules/services/security/torify.nix
+++ b/modules/services/security/torify.nix
@@ -8,7 +8,7 @@ let
     name = "torify";
     text = ''
         #!${pkgs.stdenv.shell}
-        TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.torify.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" $@
+        TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.torify.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" "$@"
     '';
     executable = true;
     destination = "/bin/torify";
@@ -66,4 +66,4 @@ in
     '';
   };
 
-}
\ No newline at end of file
+}
diff --git a/modules/services/security/torsocks.nix b/modules/services/security/torsocks.nix
index 8c2015e37c1e..d6974282a6b5 100644
--- a/modules/services/security/torsocks.nix
+++ b/modules/services/security/torsocks.nix
@@ -20,7 +20,7 @@ let
     name = name;
     text = ''
         #!${pkgs.stdenv.shell}
-        TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (makeConfig server)} LD_PRELOAD="${pkgs.torsocks}/lib/torsocks/libtorsocks.so $LD_PRELOAD" $@
+        TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (makeConfig server)} LD_PRELOAD="${pkgs.torsocks}/lib/torsocks/libtorsocks.so $LD_PRELOAD" "$@"
     '';
     executable = true;
     destination = "/bin/${name}";
-- 
cgit 1.4.1