-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch looks good to me. acked. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlJqygkACgkQrlYvE4MpobMaUACeO27DcUNzft1wOIcxQZ0L8O09 M5gAoLMadAN6eQ2kSnhlJVaKVPRdczTN =jDWw -----END PGP SIGNATURE-----
>From 73054145b5fd530cb8d779ff4b0d1efad1eaeda8 Mon Sep 17 00:00:00 2001 From: Dan Walsh <dwalsh@xxxxxxxxxx> Date: Fri, 25 Oct 2013 15:09:47 -0400 Subject: [PATCH 06/11] Michal Trunecka patch to allow restorecon to accept paths with {} The restorecon is unable to resolve paths using braced expressions like this: /sbin/ ./restorecon: lstat(/sbin/ip{6,}tables*) failed: No such file or directory The problem is that restorecon calls glob function without GLOB_BRACE flag, which en --- policycoreutils/setfiles/restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/policycoreutils/setfiles/restore.c b/policycoreutils/setfiles/restore.c index 7fe4166..2a7cfa3 100644 --- a/policycoreutils/setfiles/restore.c +++ b/policycoreutils/setfiles/restore.c @@ -375,7 +375,7 @@ int process_glob(char *name, int recurse) { size_t i = 0; int errors; memset(&globbuf, 0, sizeof(globbuf)); - errors = glob(name, GLOB_TILDE | GLOB_PERIOD | GLOB_NOCHECK, NULL, &globbuf); + errors = glob(name, GLOB_TILDE | GLOB_PERIOD | GLOB_NOCHECK | GLOB_BRACE, NULL, &globbuf); if (errors) return errors; -- 1.8.3.1