emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

2011-11-16 Peter Vrabec <pvrabec@redhat.com>

Browse Source 
* libmisc/copydir.c: Ignore perm_copy_file() errors with errno set
	to ENOTSUP.
This commit is contained in:
nekral-guest 2011-11-16 21:00:43 +00:00
parent 72ba5c4de7
commit 2e1652fdec
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-11-16 Peter Vrabec <pvrabec@redhat.com>
* libmisc/copydir.c: Ignore perm_copy_file() errors with errno set
to ENOTSUP.
2011-11-16 Nicolas François <nicolas.francois@centraliens.net> 2011-11-16 Nicolas François <nicolas.francois@centraliens.net>
* src/useradd.c: Compilation fix when SHADOWGRP is not enabled. * src/useradd.c: Compilation fix when SHADOWGRP is not enabled.

15
libmisc/copydir.c
View File

@ -180,6 +180,12 @@ static void error_acl (struct error_context *ctx, const char *fmt, ...)
{ {
va_list ap; va_list ap;
/* ignore the case when destination does not support ACLs
* or extended attributes */
if (ENOTSUP == errno) {
return;
}
va_start (ap, fmt); va_start (ap, fmt);
(void) fprintf (stderr, _("%s: "), Prog); (void) fprintf (stderr, _("%s: "), Prog);
if (vfprintf (stderr, fmt, ap) != 0) { if (vfprintf (stderr, fmt, ap) != 0) {
@ -548,7 +554,8 @@ static int copy_dir (const char *src, const char *dst,
|| (chown_if_needed (dst, statp, || (chown_if_needed (dst, statp,
old_uid, new_uid, old_gid, new_gid) != 0) old_uid, new_uid, old_gid, new_gid) != 0)
#ifdef WITH_ACL #ifdef WITH_ACL
|| (perm_copy_file (src, dst, &ctx) != 0) || ( (perm_copy_file (src, dst, &ctx) != 0)
&& (errno != ENOTSUP))
#else /* !WITH_ACL */ #else /* !WITH_ACL */
|| (chmod (dst, statp->st_mode) != 0) || (chmod (dst, statp->st_mode) != 0)
#endif /* !WITH_ACL */ #endif /* !WITH_ACL */
@ -746,7 +753,8 @@ static int copy_special (const char *src, const char *dst,
|| (chown_if_needed (dst, statp, || (chown_if_needed (dst, statp,
old_uid, new_uid, old_gid, new_gid) != 0) old_uid, new_uid, old_gid, new_gid) != 0)
#ifdef WITH_ACL #ifdef WITH_ACL
|| (perm_copy_file (src, dst, &ctx) != 0) || ( (perm_copy_file (src, dst, &ctx) != 0)
&& (errno != ENOTSUP))
#else /* !WITH_ACL */ #else /* !WITH_ACL */
|| (chmod (dst, statp->st_mode & 07777) != 0) || (chmod (dst, statp->st_mode & 07777) != 0)
#endif /* !WITH_ACL */ #endif /* !WITH_ACL */
@ -803,7 +811,8 @@ static int copy_file (const char *src, const char *dst,
|| (fchown_if_needed (ofd, statp, || (fchown_if_needed (ofd, statp,
old_uid, new_uid, old_gid, new_gid) != 0) old_uid, new_uid, old_gid, new_gid) != 0)
#ifdef WITH_ACL #ifdef WITH_ACL
|| (perm_copy_fd (src, ifd, dst, ofd, &ctx) != 0) || ( (perm_copy_fd (src, ifd, dst, ofd, &ctx) != 0)
&& (errno != ENOTSUP))
#else /* !WITH_ACL */ #else /* !WITH_ACL */
|| (fchmod (ofd, statp->st_mode & 07777) != 0) || (fchmod (ofd, statp->st_mode & 07777) != 0)
#endif /* !WITH_ACL */ #endif /* !WITH_ACL */