- Report full errors on OSError on Sandbox
This commit is contained in:
Dan Walsh
parent
e764b2d2b6
commit
331e9ad06d
@ -1555,6 +1555,33 @@ index 0000000..c0caab2
|
||||
+ if (master_wd == -1)
|
||||
+ exitApp("Error watching config file.");
|
||||
+}
|
||||
diff --git a/policycoreutils/run_init/open_init_pty.8 b/policycoreutils/run_init/open_init_pty.8
|
||||
index 540860a..10175dd 100644
|
||||
--- a/policycoreutils/run_init/open_init_pty.8
|
||||
+++ b/policycoreutils/run_init/open_init_pty.8
|
||||
@@ -24,18 +24,18 @@
|
||||
.\"
|
||||
.TH OPEN_INIT_PTY "8" "January 2005" "Security Enhanced Linux" NSA
|
||||
.SH NAME
|
||||
-open_init_pty \- run an program under a psuedo terminal
|
||||
+open_init_pty \- run an program under a pseudo terminal
|
||||
.SH SYNOPSIS
|
||||
.B open_init_pty
|
||||
\fISCRIPT\fR [[\fIARGS\fR]...]
|
||||
.br
|
||||
.SH DESCRIPTION
|
||||
.PP
|
||||
-Run a program under a psuedo terminal. This is used by
|
||||
+Run a program under a pseudo terminal. This is used by
|
||||
.B run_init
|
||||
to run actually run the program after setting up the proper
|
||||
-context. This program acquires a new Psuedo terminal, forks a child
|
||||
-process that binds to the psueado terminal, and then sits around and
|
||||
+context. This program acquires a new Pseudo terminal, forks a child
|
||||
+process that binds to the pseudo terminal, and then sits around and
|
||||
connects the physical terminal it was invoked upon with the pseudo
|
||||
terminal, passing keyboard input into to the child process, and passing the
|
||||
output of the child process to the physical terminal.
|
||||
diff --git a/policycoreutils/sandbox/Makefile b/policycoreutils/sandbox/Makefile
|
||||
index ff0ee7c..0c8a085 100644
|
||||
--- a/policycoreutils/sandbox/Makefile
|
||||
@ -1594,7 +1621,7 @@ index ff0ee7c..0c8a085 100644
|
||||
test:
|
||||
@python test_sandbox.py -v
|
||||
diff --git a/policycoreutils/sandbox/sandbox b/policycoreutils/sandbox/sandbox
|
||||
index 48a26c2..224b9d1 100644
|
||||
index 48a26c2..d1037bd 100644
|
||||
--- a/policycoreutils/sandbox/sandbox
|
||||
+++ b/policycoreutils/sandbox/sandbox
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1834,6 +1861,15 @@ index 48a26c2..224b9d1 100644
|
||||
|
||||
selinux.setexeccon(self.__execcon)
|
||||
rc = subprocess.Popen(self.__cmds).wait()
|
||||
@@ -404,7 +447,7 @@ if __name__ == '__main__':
|
||||
sandbox = Sandbox()
|
||||
rc = sandbox.main()
|
||||
except OSError, error:
|
||||
- error_exit(error.args[1])
|
||||
+ error_exit(error)
|
||||
except ValueError, error:
|
||||
error_exit(error.args[0])
|
||||
except KeyError, error:
|
||||
diff --git a/policycoreutils/sandbox/sandbox.8 b/policycoreutils/sandbox/sandbox.8
|
||||
index 1479364..73d33b3 100644
|
||||
--- a/policycoreutils/sandbox/sandbox.8
|
||||
@ -2001,7 +2037,7 @@ index 8338203..e501b03 100644
|
||||
break
|
||||
diff --git a/policycoreutils/sandbox/seunshare.8 b/policycoreutils/sandbox/seunshare.8
|
||||
new file mode 100644
|
||||
index 0000000..e7b8991
|
||||
index 0000000..67beca0
|
||||
--- /dev/null
|
||||
+++ b/policycoreutils/sandbox/seunshare.8
|
||||
@@ -0,0 +1,37 @@
|
||||
@ -2023,7 +2059,7 @@ index 0000000..e7b8991
|
||||
+Alternate homedir to be used by the application. Homedir must be owned by the user.
|
||||
+.TP
|
||||
+\fB\-t\ tmpdir
|
||||
+Use alternate tempory directory to mount on /tmp. tmpdir must be owned by the user.
|
||||
+Use alternate temporary directory to mount on /tmp. tmpdir must be owned by the user.
|
||||
+.TP
|
||||
+\fB\-c cgroups\fR
|
||||
+Use cgroups to control this copy of seunshare. Specify parameters in /etc/sysconfig/sandbox. Max memory usage and cpu usage are to be specified in percent. You can specify which CPUs to use by numbering them 0,1,2... etc.
|
||||
@ -4810,9 +4846,18 @@ index 1eb6a43..c8ea4bb 100644
|
||||
.B \-v
|
||||
show changes in file labels.
|
||||
diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8
|
||||
index ac68b94..28f99d9 100644
|
||||
index ac68b94..7f700ca 100644
|
||||
--- a/policycoreutils/setfiles/setfiles.8
|
||||
+++ b/policycoreutils/setfiles/setfiles.8
|
||||
@@ -10,7 +10,7 @@ This manual page describes the
|
||||
.BR setfiles
|
||||
program.
|
||||
.P
|
||||
-This program is primarily used to initialise the security context
|
||||
+This program is primarily used to initialize the security context
|
||||
database (extended attributes) on one or more filesystems. This
|
||||
program is initially run as part of the SE Linux installation process.
|
||||
.P
|
||||
@@ -31,6 +31,9 @@ log changes in file labels to syslog.
|
||||
.TP
|
||||
.B \-n
|
||||
@ -4966,6 +5011,19 @@ index 8f4f663..b0a7e09 100644
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/policycoreutils/setsebool/setsebool.8 b/policycoreutils/setsebool/setsebool.8
|
||||
index 4b13387..2b66bad 100644
|
||||
--- a/policycoreutils/setsebool/setsebool.8
|
||||
+++ b/policycoreutils/setsebool/setsebool.8
|
||||
@@ -16,7 +16,7 @@ affected; the boot-time default settings
|
||||
are not changed.
|
||||
|
||||
If the -P option is given, all pending values are written to
|
||||
-the policy file on disk. So they will be persistant across reboots.
|
||||
+the policy file on disk. So they will be persistent across reboots.
|
||||
|
||||
.SH AUTHOR
|
||||
This manual page was written by Dan Walsh <dwalsh@redhat.com>.
|
||||
diff --git a/policycoreutils/setsebool/setsebool.c b/policycoreutils/setsebool/setsebool.c
|
||||
index dc037dd..d6c041b 100644
|
||||
--- a/policycoreutils/setsebool/setsebool.c
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
Summary: SELinux policy core utilities
|
||||
Name: policycoreutils
|
||||
Version: 2.0.85
|
||||
Release: 8%{?dist}
|
||||
Release: 9%{?dist}
|
||||
License: GPLv2
|
||||
Group: System Environment/Base
|
||||
# Based on git repository with tag 20101221
|
||||
@ -329,6 +329,9 @@ fi
|
||||
exit 0
|
||||
|
||||
%changelog
|
||||
* Wed Feb 2 2011 Dan Walsh <dwalsh@redhat.com> 2.0.85-9
|
||||
- Report full errors on OSError on Sandbox
|
||||
|
||||
* Wed Jan 21 2011 Dan Walsh <dwalsh@redhat.com> 2.0.85-8
|
||||
- Fix newrole hanlding of pcap
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user