From c1fea2c0d236a152efdff96c019e23ce1b4b1095 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 29 Dec 2012 19:02:34 +0200
Subject: [PATCH] Fix return values of set-file-acl and
 set-file-selinux-context when ENOTSUP.

Fixes: debbugs:13298
---
 src/fileio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fileio.c b/src/fileio.c
index e824a7abcc..241775abec 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3065,7 +3065,7 @@ or if Emacs was not compiled with SELinux support.  */)
 
 	  context_free (parsed_con);
 	  freecon (con);
-	  return Qt;
+	  return fail ? Qnil : Qt;
 	}
       else
 	report_file_error ("Doing lgetfilecon", Fcons (absname, Qnil));
@@ -3171,7 +3171,7 @@ support.  */)
 	report_file_error ("Setting ACL", Fcons (absname, Qnil));
 
       acl_free (acl);
-      return Qt;
+      return fail ? Qnil : Qt;
     }
 #endif
 
-- 
2.20.1