-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch looks good to me. acked. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk5WstQACgkQrlYvE4MpobPEGwCghj/i6tP35FOZbiA0JnuNEbL3 QYkAoKog3t+ASmikcuBjmtWctXooKxjR =P0bp -----END PGP SIGNATURE-----
>From 6d6c2103be445741ed30c0a146115a130763e2c5 Mon Sep 17 00:00:00 2001 From: Eric Paris <eparis@xxxxxxxxxx> Date: Wed, 3 Aug 2011 14:27:32 -0400 Subject: [PATCH 44/77] policycoreutils: sandbox: whitespace fix couple of whitespace at the end of the line. Signed-off-by: Eric Paris <eparis@xxxxxxxxxx> --- policycoreutils/sandbox/sandbox | 8 ++++---- policycoreutils/sandbox/seunshare.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/policycoreutils/sandbox/sandbox b/policycoreutils/sandbox/sandbox index 0b89e9a..16e6be7 100644 --- a/policycoreutils/sandbox/sandbox +++ b/policycoreutils/sandbox/sandbox @@ -260,10 +260,10 @@ sandbox [-h] [-[X|M] [-l level ] [-H homedir] [-T tempdir]] [-I includefile ] [- parser.add_option("-H", "--homedir", action="callback", callback=self.__validdir, type="string", - dest="homedir", + dest="homedir", help=_("alternate home directory to use for mounting")) - parser.add_option("-T", "--tmpdir", dest="tmpdir", + parser.add_option("-T", "--tmpdir", dest="tmpdir", type="string", action="callback", callback=self.__validdir, help=_("alternate /tmp directory to use for mounting")) @@ -323,8 +323,8 @@ sandbox [-h] [-[X|M] [-l level ] [-H homedir] [-T tempdir]] [-I includefile ] [- con = selinux.getcon()[1].split(":") self.__execcon = "%s:%s:%s:%s" % (con[0], con[1], self.setype, level) - self.__filecon = "%s:%s:%s:%s" % (con[0], "object_r", - "%s_file_t" % self.setype[:-2], + self.__filecon = "%s:%s:%s:%s" % (con[0], "object_r", + "%s_file_t" % self.setype[:-2], level) def __setup_dir(self): if self.__options.level or self.__options.session: diff --git a/policycoreutils/sandbox/seunshare.c b/policycoreutils/sandbox/seunshare.c index e713b74..252c705 100644 --- a/policycoreutils/sandbox/seunshare.c +++ b/policycoreutils/sandbox/seunshare.c @@ -61,7 +61,7 @@ static int drop_capabilities(uid_t uid) static int verbose = 0; /** - * Take care of any signal setup + * Take care of any signal setup. */ static int set_signal_handles(void) { -- 1.7.6