procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fileio.c fix for bug#11245

Browse source 
* src/fileio.c (Fcopy_file, Fset_file_selinux_context):
Ignore ENOTSUP failures from setfilecon functions.
This commit is contained in:
Glenn Morris 2012-04-20 13:34:51 -04:00
parent 73055685ff
commit 24c51a09d6
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-04-20 Glenn Morris <rgm@gnu.org>
* fileio.c (Fcopy_file, Fset_file_selinux_context):
Ignore ENOTSUP failures from setfilecon functions. (Bug#11245)
2012-04-20 Eli Zaretskii <eliz@gnu.org>
* dispnew.c (swap_glyph_pointers, copy_row_except_pointers): Don't

12
src/fileio.c
View file

@ -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 @@ on the system, we copy the SELinux context of FILE to NEWNAME. */)
#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 @@ compiled with SELinux support. */)
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);