#ifdef-out matchpathcon-related code, for now.

* src/install.c (setdefaultfilecon): #ifdef-out all of the
matchpathcon-related code, until it's more efficient.

diff --git a/ChangeLog b/ChangeLog
index a42a5dc..b6b86bb 100644 (file)
--- 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 216715f..450370e 100644 (file)
--- 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,