From: Jim Meyering <meyering@redhat.com>
Date: Wed, 14 Nov 2007 22:34:19 +0000 (+0100)
Subject: src/install.c (setdefaultfilecon): Stub-out the entire function.
X-Git-Tag: v6.9.90~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c59b53d8be9c260d83838db2ac62dd7495a6bf4;p=thirdparty%2Fcoreutils.git

src/install.c (setdefaultfilecon): Stub-out the entire function.
---

diff --git a/ChangeLog b/ChangeLog
index b6b86bb964..d598557267 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 	#ifdef-out matchpathcon-related code, for now.
 	* src/install.c (setdefaultfilecon): #ifdef-out all of the
 	matchpathcon-related code, until it's more efficient.
+	(setdefaultfilecon): Instead of the above, stub-out the entire function.
 
 	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 450370e6c9..8e48758448 100644
--- a/src/install.c
+++ b/src/install.c
@@ -197,6 +197,7 @@ cp_option_init (struct cp_options *x)
   x->src_info = NULL;
 }
 
+#ifdef ENABLE_WHEN_MATCHPATHCON_IS_MORE_EFFICIENT
 /* Modify file context to match the specified policy.
    If an error occurs the file will remain with the default directory
    context.  */
@@ -213,7 +214,6 @@ 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/")
@@ -255,7 +255,6 @@ setdefaultfilecon (char const *file)
 	freecon (scontext);
       return;
     }
-#endif
 
   if (lsetfilecon (file, scontext) < 0 && errno != ENOTSUP)
     error (0, errno,
@@ -265,6 +264,13 @@ setdefaultfilecon (char const *file)
   freecon (scontext);
   return;
 }
+#else
+static void
+setdefaultfilecon (char const *file)
+{
+  (void) file;
+}
+#endif
 
 /* FILE is the last operand of this command.  Return true if FILE is a
    directory.  But report an error there is a problem accessing FILE,