From 3c562f3cfdf0b04a0558655fc01d35e58b55a047 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Sun, 24 Feb 2013 10:10:41 +0100 Subject: [PATCH 1/2] version 2.1.12 --- version_dom0 | 2 +- version_vm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/version_dom0 b/version_dom0 index a39c0b78..348fc11e 100644 --- a/version_dom0 +++ b/version_dom0 @@ -1 +1 @@ -2.1.11 +2.1.12 diff --git a/version_vm b/version_vm index a39c0b78..348fc11e 100644 --- a/version_vm +++ b/version_vm @@ -1 +1 @@ -2.1.11 +2.1.12 From a87234244bb2ed46d216eb09028651c839b78194 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Mon, 25 Feb 2013 11:13:19 +0100 Subject: [PATCH 2/2] qrexec_policy: Improve user message readability --- qrexec/qrexec_policy | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/qrexec/qrexec_policy b/qrexec/qrexec_policy index 69b9cafb..c72aaee2 100755 --- a/qrexec/qrexec_policy +++ b/qrexec/qrexec_policy @@ -121,9 +121,8 @@ def add_always_allow(domain, target, exec_index, options): f.close() def policy_editor(domain, target, exec_index): - text = "Policy editor not yet implemented. Please add a line in the form \"" - text+= domain + " " + target + " action_to_take\"" - text+= " to /etc/qubes_rpc/policy/" + exec_index +" file in dom0, then close this info." + text = "No policy definition found for " + exec_index + " action. " + text+= "Please create a policy file in Dom0 in " + "/etc/qubes_rpc/policy/" + exec_index subprocess.call(["/usr/bin/zenity", "--info", "--text", text]) def main():