-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch looks good to me. acked. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/I+I8ACgkQrlYvE4MpobP2OACgjD+qh0fTDHsiobZc29qqNzVr VFQAn0D0c+vm2lgdpvYlPvIq9CpHGp0l =kWjr -----END PGP SIGNATURE-----
>From a1bd83c8cd4d8905bdfa45145f1fc25ffd19a78f Mon Sep 17 00:00:00 2001 From: Dan Walsh <dwalsh@xxxxxxxxxx> Date: Thu, 29 Mar 2012 12:39:50 -0400 Subject: [PATCH 31/90] policycoreutils: semanage: only allow enable/disable under -m Fix --enable and --disable for modules to only work under -m options Signed-off-by: Eric Paris <eparis@xxxxxxxxxx> --- policycoreutils/semanage/semanage | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/policycoreutils/semanage/semanage b/policycoreutils/semanage/semanage index aaba8b1..e099c21 100644 --- a/policycoreutils/semanage/semanage +++ b/policycoreutils/semanage/semanage @@ -1,5 +1,5 @@ #! /usr/bin/python -Es -# Copyright (C) 2005, 2006, 2007 Red Hat +# Copyright (C) 2005-2012 Red Hat # see file 'COPYING' for use and warranty information # # semanage is a tool for managing SELinux configuration files @@ -284,11 +284,9 @@ Object-specific Options (see above): equal = a if o == "--enable": - set_action(o) enable = True if o == "--disable": - set_action(o) disable = True if o == "-F" or o == "--file": -- 1.7.10.2
