From: Jim Meyering <meyering@redhat.com>
Date: Wed, 14 Nov 2007 21:36:10 +0000 (+0100)
Subject: #ifdef-out matchpathcon-related code, for now.
X-Git-Tag: v6.9.90~55
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92490afb6d347a0bc79f63cfc966e1f388779c33;p=platform%2Fupstream%2Fcoreutils.git

#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
--- 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
--- 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,