summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2007-11-14 22:36:10 +0100
committerJim Meyering <meyering@redhat.com>2007-11-14 22:36:10 +0100
commit92490afb6d347a0bc79f63cfc966e1f388779c33 (patch)
tree87da2c65c0dabd1720104c7e2327c60e55e80b31
parent8e412d1ac08c95fe1f80e2640f803429fc555ee6 (diff)
downloadcoreutils-92490afb6d347a0bc79f63cfc966e1f388779c33.tar.xz
#ifdef-out matchpathcon-related code, for now.
* src/install.c (setdefaultfilecon): #ifdef-out all of the matchpathcon-related code, until it's more efficient.
-rw-r--r--ChangeLog4
-rw-r--r--src/install.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a42a5dc9d..b6b86bb96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-11-14 Jim Meyering <meyering@redhat.com>
+ #ifdef-out matchpathcon-related code, for now.
+ * src/install.c (setdefaultfilecon): #ifdef-out all of the
+ matchpathcon-related code, until it's more efficient.
+
Use gnulib's stpncpy module, now required by install.c
* bootstrap.conf (gnulib_modules): Add stpncpy.
diff --git a/src/install.c b/src/install.c
index 216715f5c..450370e6c 100644
--- a/src/install.c
+++ b/src/install.c
@@ -213,6 +213,7 @@ setdefaultfilecon (char const *file)
if (lstat (file, &st) != 0)
return;
+#ifdef ENABLE_WHEN_MATCHPATHCON_IS_MORE_EFFICIENT
if (IS_ABSOLUTE_FILE_NAME (file))
{
/* Calling matchpathcon_init_prefix (NULL, "/first_component/")
@@ -254,6 +255,7 @@ setdefaultfilecon (char const *file)
freecon (scontext);
return;
}
+#endif
if (lsetfilecon (file, scontext) < 0 && errno != ENOTSUP)
error (0, errno,