|
 |
e316053 |
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.25/src/genhomedircon.c
|
|
|
e316053 |
--- nsalibsemanage/src/genhomedircon.c 2008-06-12 23:25:16.000000000 -0400
|
|
|
e316053 |
+++ libsemanage-2.0.25/src/genhomedircon.c 2008-07-17 14:32:45.000000000 -0400
|
|
|
e316053 |
@@ -192,6 +193,11 @@
|
|
|
e316053 |
goto done;
|
|
|
e316053 |
}
|
|
|
e316053 |
|
|
|
e316053 |
+ if (ustr_cmp_suffix_cstr_eq(expr, "/")) {
|
|
|
e316053 |
+ if (!ustr_del(&expr, 1))
|
|
|
e316053 |
+ goto done;
|
|
|
e316053 |
+ }
|
|
|
e316053 |
+
|
|
|
e316053 |
/* Append pattern to eat up trailing slashes */
|
|
|
e316053 |
if (!ustr_add_cstr(&expr, "/*$"))
|
|
|
e316053 |
goto done;
|
|
|
e316053 |
@@ -482,7 +488,6 @@
|
|
|
683732d |
const char *role_prefix)
|
|
|
683732d |
{
|
|
|
683732d |
replacement_pair_t repl[] = {
|
|
|
683732d |
- {.search_for = TEMPLATE_SEUSER,.replace_with = seuser},
|
|
|
683732d |
{.search_for = TEMPLATE_HOME_DIR,.replace_with = home},
|
|
|
683732d |
{.search_for = TEMPLATE_ROLE,.replace_with = role_prefix},
|
|
|
683732d |
{NULL, NULL}
|
|
|
e316053 |
@@ -542,7 +547,6 @@
|
|
|
683732d |
replacement_pair_t repl[] = {
|
|
|
683732d |
{.search_for = TEMPLATE_USER,.replace_with = user},
|
|
|
683732d |
{.search_for = TEMPLATE_ROLE,.replace_with = role_prefix},
|
|
|
683732d |
- {.search_for = TEMPLATE_SEUSER,.replace_with = seuser},
|
|
|
683732d |
{NULL, NULL}
|
|
|
683732d |
};
|
|
|
683732d |
Ustr *line = USTR_NULL;
|
|
|
e316053 |
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.25/src/semanage.conf
|
|
|
e316053 |
--- nsalibsemanage/src/semanage.conf 2008-06-12 23:25:16.000000000 -0400
|
|
|
e316053 |
+++ libsemanage-2.0.25/src/semanage.conf 2008-07-17 13:58:44.000000000 -0400
|
|
|
15aa870 |
@@ -35,4 +35,4 @@
|
|
|
15aa870 |
# given in <sepol/policydb.h>. Change this setting if a different
|
|
|
15aa870 |
# version is necessary.
|
|
|
15aa870 |
#policy-version = 19
|
|
|
15aa870 |
-
|
|
|
15aa870 |
+expand-check=0
|