2008-09-03 21:46:03 +00:00
|
|
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.55/Makefile
|
2008-08-29 19:05:21 +00:00
|
|
|
--- nsapolicycoreutils/Makefile 2008-08-28 09:34:24.000000000 -0400
|
2008-09-03 21:46:03 +00:00
|
|
|
+++ policycoreutils-2.0.55/Makefile 2008-08-29 14:34:58.000000000 -0400
|
2008-07-10 13:40:20 +00:00
|
|
|
@@ -1,4 +1,4 @@
|
|
|
|
-SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
|
|
|
|
+SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
|
|
|
|
|
|
|
|
INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
|
|
|
|
|
2008-09-03 21:46:03 +00:00
|
|
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.55/semanage/semanage
|
2008-09-12 15:58:45 +00:00
|
|
|
--- nsapolicycoreutils/semanage/semanage 2008-09-12 11:48:15.000000000 -0400
|
|
|
|
+++ policycoreutils-2.0.55/semanage/semanage 2008-09-12 11:49:59.000000000 -0400
|
|
|
|
@@ -43,7 +43,7 @@
|
2008-08-06 22:11:40 +00:00
|
|
|
if __name__ == '__main__':
|
|
|
|
|
2008-07-29 13:30:54 +00:00
|
|
|
def usage(message = ""):
|
2008-09-12 15:58:45 +00:00
|
|
|
- raise ValueError(_("""
|
2008-09-12 15:45:19 +00:00
|
|
|
+ text = _("""
|
2008-09-12 15:58:45 +00:00
|
|
|
semanage [ -S store ] -i [ input_file | - ]
|
2008-09-12 15:45:19 +00:00
|
|
|
|
2008-09-12 15:58:45 +00:00
|
|
|
semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
|
|
|
|
@@ -94,8 +94,8 @@
|
2008-08-06 22:11:40 +00:00
|
|
|
-s, --seuser SELinux User Name
|
|
|
|
-t, --type SELinux Type for the object
|
2008-09-12 15:58:45 +00:00
|
|
|
-r, --range MLS/MCS Security Range (MLS/MCS Systems only)
|
|
|
|
-%s
|
|
|
|
-""") % message)
|
|
|
|
+""")
|
2008-09-12 15:45:19 +00:00
|
|
|
+ raise ValueError("%s\n%s" % (text, message))
|
2008-08-06 22:11:40 +00:00
|
|
|
|
|
|
|
def errorExit(error):
|
|
|
|
sys.stderr.write("%s: " % sys.argv[0])
|
2008-09-12 15:58:45 +00:00
|
|
|
@@ -198,7 +198,7 @@
|
|
|
|
object = argv[0]
|
2008-08-06 22:11:40 +00:00
|
|
|
option_dict=get_options()
|
|
|
|
if object not in option_dict.keys():
|
2008-09-12 15:45:19 +00:00
|
|
|
- usage(_("%s not defined") % object)
|
|
|
|
+ usage(_("Invalid parameter %s not defined") % object)
|
2008-08-06 22:11:40 +00:00
|
|
|
|
2008-09-12 15:58:45 +00:00
|
|
|
args = argv[1:]
|
2008-08-06 22:11:40 +00:00
|
|
|
|