-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This patch looks good to me. acked.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk/I+m8ACgkQrlYvE4MpobMjxgCeP5YcLBPqGr394BofoeJ6O1cl
p/4AoKZoVZQJ8PuxvR6VvkL7A8Fe0klf
=9AnI
-----END PGP SIGNATURE-----
>From 2374e68bd879e9b0055de80f69dbcbb065902328 Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@xxxxxxxxxx>
Date: Tue, 8 May 2012 15:59:54 -0400
Subject: [PATCH 59/90] Fix template to place ',' in read_cache_files
interface
---
policycoreutils/gui/templates/var_cache.py | 2 +-
policycoreutils/setsebool/setsebool.c | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/policycoreutils/gui/templates/var_cache.py b/policycoreutils/gui/templates/var_cache.py
index 84b342f..8efc1d9 100644
--- a/policycoreutils/gui/templates/var_cache.py
+++ b/policycoreutils/gui/templates/var_cache.py
@@ -70,7 +70,7 @@ interface(`TEMPLATETYPE_read_cache_files',`
')
files_search_var($1)
- read_files_pattern($1, TEMPLATETYPE_cache_t TEMPLATETYPE_cache_t)
+ read_files_pattern($1, TEMPLATETYPE_cache_t, TEMPLATETYPE_cache_t)
')
########################################
diff --git a/policycoreutils/setsebool/setsebool.c b/policycoreutils/setsebool/setsebool.c
index d6c041b..45cfd20 100644
--- a/policycoreutils/setsebool/setsebool.c
+++ b/policycoreutils/setsebool/setsebool.c
@@ -21,7 +21,7 @@ int setbool(char **list, size_t start, size_t end);
void usage(void)
{
fputs
- ("\nUsage: setsebool [ -P ] boolean value | bool1=val1 bool2=val2...\n\n",
+ ("\nUsage: setsebool [ -NP ] boolean value | bool1=val1 bool2=val2...\n\n",
stderr);
exit(1);
}
@@ -38,6 +38,13 @@ int main(int argc, char **argv)
return 1;
}
+ if (strcmp(argv[1], "-N") == 0) {
+ permanent = 1;
+ if (argc < 3)
+ usage();
+ start = 2;
+ }
+
if (strcmp(argv[1], "-P") == 0) {
permanent = 1;
if (argc < 3)
--
1.7.10.2
