Fix semanage export/import commands

- Fix semange module command
This commit is contained in:
Dan Walsh 2013-06-19 10:52:59 -04:00
parent 11643b3535
commit 56882a583a

View File

@ -248350,10 +248350,18 @@ index d1b435c..1c323d2 100644
account include system-auth account include system-auth
password include system-auth password include system-auth
diff --git a/policycoreutils/sandbox/sandbox b/policycoreutils/sandbox/sandbox diff --git a/policycoreutils/sandbox/sandbox b/policycoreutils/sandbox/sandbox
index b629006..49f735a 100644 index b629006..fb5a24c 100644
--- a/policycoreutils/sandbox/sandbox --- a/policycoreutils/sandbox/sandbox
+++ b/policycoreutils/sandbox/sandbox +++ b/policycoreutils/sandbox/sandbox
@@ -243,7 +243,7 @@ class Sandbox: @@ -170,7 +170,6 @@ def fullpath(cmd):
return cmd
class Sandbox:
- VERSION = "sandbox .1"
SYSLOG = "/var/log/messages"
def __init__(self):
@@ -243,7 +242,7 @@ class Sandbox:
copyfile(f, "/tmp", self.__tmpdir) copyfile(f, "/tmp", self.__tmpdir)
copyfile(f, "/var/tmp", self.__tmpdir) copyfile(f, "/var/tmp", self.__tmpdir)
@ -248362,7 +248370,16 @@ index b629006..49f735a 100644
execfile =self.__homedir + "/.sandboxrc" execfile =self.__homedir + "/.sandboxrc"
fd = open(execfile, "w+") fd = open(execfile, "w+")
if self.__options.session: if self.__options.session:
@@ -333,7 +333,7 @@ sandbox [-h] [-c] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile @@ -287,7 +286,7 @@ sandbox [-h] [-c] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile
%s
""") % types
- parser = OptionParser(version=self.VERSION, usage=usage)
+ parser = OptionParser(usage=usage)
parser.disable_interspersed_args()
parser.add_option("-i", "--include",
action="callback", callback=self.__include,
@@ -333,7 +332,7 @@ sandbox [-h] [-c] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile
parser.add_option("-W", "--windowmanager", dest="wm", parser.add_option("-W", "--windowmanager", dest="wm",
type="string", type="string",
@ -248371,7 +248388,7 @@ index b629006..49f735a 100644
help=_("alternate window manager")) help=_("alternate window manager"))
parser.add_option("-l", "--level", dest="level", parser.add_option("-l", "--level", dest="level",
@@ -403,9 +403,7 @@ sandbox [-h] [-c] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile @@ -403,9 +402,7 @@ sandbox [-h] [-c] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile
con = selinux.getcon()[1].split(":") con = selinux.getcon()[1].split(":")
self.__execcon = "%s:%s:%s:%s" % (con[0], con[1], self.setype, level) self.__execcon = "%s:%s:%s:%s" % (con[0], con[1], self.setype, level)