mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-01 14:55:10 +00:00
Code Issues Releases Wiki Activity

utils/apparmor/sandbox.py: fix up arg validation for --with-xserver

Browse Source
This commit is contained in:
Jamie Strandboge
2012-08-24 10:34:14 -05:00
parent 5ce539c432
commit cf24f21a77
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/apparmor/sandbox.py
View File

@@ -66,12 +66,13 @@ def parse_args(args=None, parser=None):
(my_opt, my_args) = parser.parse_args() (my_opt, my_args) = parser.parse_args()
if my_opt.debug == True: if my_opt.debug == True:
apparmor.common.DEBUGGING = True apparmor.common.DEBUGGING = True
if my_opt.withx and my_opt.xserver.lower() != 'xpra' and \
my_opt.xserver.lower() != 'xpra3d' and \
my_opt.xserver.lower() != 'xephyr':
error("Invalid server '%s'. Use 'xpra', ''xpra3d', or 'xephyr'" % \
my_opt.xserver)
if my_opt.template == "default": if my_opt.template == "default":
if my_opt.withx: if my_opt.withx:
if my_opt.xserver.lower() != 'xpra' and \
my_opt.xserver.lower() != 'xephyr':
error("Invalid server '%s'. Use 'xpra' or 'xephyr'" % \
my_opt.xserver)
my_opt.template = "sandbox-x" my_opt.template = "sandbox-x"
else: else:
my_opt.template = "sandbox" my_opt.template = "sandbox"