Fix spurious out of memory error reports. Merged second version of fix for genhomedircon handling from Caleb Case.
29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.15/src/genhomedircon.c
|
|
--- nsalibsemanage/src/genhomedircon.c 2008-01-28 16:52:22.000000000 -0500
|
|
+++ libsemanage-2.0.15/src/genhomedircon.c 2008-01-25 10:28:39.000000000 -0500
|
|
@@ -406,7 +406,6 @@
|
|
const char *role_prefix)
|
|
{
|
|
replacement_pair_t repl[] = {
|
|
- {.search_for = TEMPLATE_SEUSER,.replace_with = seuser},
|
|
{.search_for = TEMPLATE_HOME_DIR,.replace_with = home},
|
|
{.search_for = TEMPLATE_ROLE,.replace_with = role_prefix},
|
|
{NULL, NULL}
|
|
@@ -466,7 +465,6 @@
|
|
replacement_pair_t repl[] = {
|
|
{.search_for = TEMPLATE_USER,.replace_with = user},
|
|
{.search_for = TEMPLATE_ROLE,.replace_with = role_prefix},
|
|
- {.search_for = TEMPLATE_SEUSER,.replace_with = seuser},
|
|
{NULL, NULL}
|
|
};
|
|
Ustr *line = USTR_NULL;
|
|
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.15/src/semanage.conf
|
|
--- nsalibsemanage/src/semanage.conf 2007-07-16 14:20:38.000000000 -0400
|
|
+++ libsemanage-2.0.15/src/semanage.conf 2008-01-25 10:28:39.000000000 -0500
|
|
@@ -35,4 +35,4 @@
|
|
# given in <sepol/policydb.h>. Change this setting if a different
|
|
# version is necessary.
|
|
#policy-version = 19
|
|
-
|
|
+expand-check=0
|