[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107874: fileio.c fix for bug#11245

[Glenn Morris]

------------------------------------------------------------
revno: 107874
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-04-20 13:34:51 -0400
message:
  fileio.c fix for bug#11245
  
  * src/fileio.c (Fcopy_file, Fset_file_selinux_context):
  Ignore ENOTSUP failures from setfilecon functions.
modified:
  src/ChangeLog
  src/fileio.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-04-20 14:08:55 +0000
+++ b/src/ChangeLog     2012-04-20 17:34:51 +0000
@@ -1,3 +1,8 @@
+2012-04-20  Glenn Morris  <address@hidden>
+
+       * fileio.c (Fcopy_file, Fset_file_selinux_context):
+       Ignore ENOTSUP failures from setfilecon functions.  (Bug#11245)
+
 2012-04-20  Eli Zaretskii  <address@hidden>
 
        * dispnew.c (swap_glyph_pointers, copy_row_except_pointers): Don't

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2012-02-25 09:07:23 +0000
+++ b/src/fileio.c      2012-04-20 17:34:51 +0000
@@ -1,6 +1,6 @@
 /* File IO for GNU Emacs.
 
-Copyright (C) 1985-1988, 1993-2012  Free Software Foundation, Inc.
+Copyright (C) 1985-1988, 1993-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2044,9 +2044,10 @@
 #if HAVE_LIBSELINUX
   if (conlength > 0)
     {
-      /* Set the modified context back to the file. */
+      /* Set the modified context back to the file.  */
       fail = fsetfilecon (ofd, con);
-      if (fail)
+      /* See http://debbugs.gnu.org/11245 for ENOTSUP.  */
+      if (fail && errno != ENOTSUP)
        report_file_error ("Doing fsetfilecon", Fcons (newname, Qnil));
 
       freecon (con);
@@ -2917,10 +2918,11 @@
                error ("Doing context_range_set");
            }
 
-         /* Set the modified context back to the file. */
+         /* Set the modified context back to the file.  */
          fail = lsetfilecon (SSDATA (encoded_absname),
                              context_str (parsed_con));
-         if (fail)
+          /* See http://debbugs.gnu.org/11245 for ENOTSUP.  */
+         if (fail && errno != ENOTSUP)
            report_file_error ("Doing lsetfilecon", Fcons (absname, Qnil));
 
          context_free (parsed_con);