diff --git a/utils/aa-disable b/utils/aa-disable index b43cad828..c12c85a76 100755 --- a/utils/aa-disable +++ b/utils/aa-disable @@ -22,7 +22,6 @@ _ = init_translation() parser = argparse.ArgumentParser(description=_('Disable the profile for the given programs')) parser.add_argument('-d', '--dir', type=str, help=_('path to profiles')) -parser.add_argument('-r', '--revert', action='store_true', help=_('enable the profile for the given programs')) parser.add_argument('program', type=str, nargs='+', help=_('name of program')) args = parser.parse_args() diff --git a/utils/aa-disable.pod b/utils/aa-disable.pod index 3f665df50..ae47c2d9d 100644 --- a/utils/aa-disable.pod +++ b/utils/aa-disable.pod @@ -35,10 +35,6 @@ B<-d --dir /path/to/profiles> Specifies where to look for the AppArmor security profile set. Defaults to /etc/apparmor.d. -B<-r --revert> - - Enables the profile and loads it. - =head1 DESCRIPTION B is used to I one or more profiles. diff --git a/utils/apparmor/tools.py b/utils/apparmor/tools.py index 1bf4610a0..6282fbe78 100644 --- a/utils/apparmor/tools.py +++ b/utils/apparmor/tools.py @@ -33,7 +33,6 @@ class aa_tools: if tool_name in ['audit', 'complain']: self.remove = args.remove elif tool_name == 'disable': - self.revert = args.revert self.disabledir = apparmor.profile_dir + '/disable' self.check_disable_dir() elif tool_name == 'autodep': diff --git a/utils/test/minitools_test.py b/utils/test/minitools_test.py index 228302765..3e1d3fb5f 100755 --- a/utils/test/minitools_test.py +++ b/utils/test/minitools_test.py @@ -97,12 +97,6 @@ class Test(unittest.TestCase): self.assertEqual(os.path.islink('./profiles/disable/%s'%os.path.basename(local_profilename)), True, 'Failed to create a symlink for %s in disable'%local_profilename) - #Enable the ntpd profile and check if it was correctly re-enabled - subprocess.check_output('%s ./../aa-disable -d ./profiles -r %s'%(python_interpreter, test_path), shell=True) - - self.assertEqual(os.path.islink('./profiles/disable/%s'%os.path.basename(local_profilename)), False, 'Failed to remove a symlink for %s from disable'%local_profilename) - - def test_autodep(self): pass