Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.qubes-os.org/joanna/core

Browse Source
This commit is contained in:
Marek Marczykowski 2013-02-25 13:26:44 +01:00
commit 3a4c7cb9c4
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qrexec/qrexec_policy
View File

@ -121,9 +121,8 @@ def add_always_allow(domain, target, exec_index, options):
f.close() f.close()
def policy_editor(domain, target, exec_index): def policy_editor(domain, target, exec_index):
text = "Policy editor not yet implemented. Please add a line in the form \"" text = "No policy definition found for " + exec_index + " action. "
text+= domain + " " + target + " action_to_take\"" text+= "Please create a policy file in Dom0 in " + "/etc/qubes_rpc/policy/" + exec_index
text+= " to /etc/qubes_rpc/policy/" + exec_index +" file in dom0, then close this info."
subprocess.call(["/usr/bin/zenity", "--info", "--text", text]) subprocess.call(["/usr/bin/zenity", "--info", "--text", text])
def main(): def main():

2
version_dom0
View File

@ -1 +1 @@
2.1.11 2.1.12

2
version_vm
View File

@ -1 +1 @@
2.1.11 2.1.12