From 8fd4d9e853ddab39837e46a233dfad6cc2b61bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Thu, 18 May 2017 01:44:25 +0200
Subject: [PATCH] qrexec: adjust for new qrexec-policy

New qrexec-policy can provide information about original target domain,
even if later overriden by policy (using target= keyword).
---
 qrexec/qubes-rpc-multiplexer | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/qrexec/qubes-rpc-multiplexer b/qrexec/qubes-rpc-multiplexer
index 19d1369..8a4a2d0 100755
--- a/qrexec/qubes-rpc-multiplexer
+++ b/qrexec/qubes-rpc-multiplexer
@@ -8,10 +8,11 @@ rm -f /tmp/qrexec-rpc-stderr.$$
 QUBES_RPC=/etc/qubes-rpc
 LOCAL_QUBES_RPC=/usr/local/etc/qubes-rpc
 
-if ! [ $# = 2 ] ; then
-	echo $0: bad argument count, usage: $0 SERVICE-NAME REMOTE-DOMAIN-NAME >&2
+if ! [ $# = 2 -o $# == 3 ] ; then
+	echo "$0: bad argument count, usage: $0 SERVICE-NAME REMOTE-DOMAIN-NAME [REQUESTED_TARGET]" >&2
 	exit 1
 fi
+export QREXEC_REQUESTED_TARGET="$3"
 export QREXEC_REMOTE_DOMAIN="$2"
 export QREXEC_SERVICE_FULL_NAME="$1"
 SERVICE_WITHOUT_ARGUMENT="${1%%+*}"