From: DongHun Kwak Date: Tue, 29 Mar 2016 00:58:57 +0000 (+0900) Subject: Fix smack rule copy at scratch box X-Git-Tag: submit/tizen_base/20160329.034516^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bd50135bf441776209929bc6ab6d3b7303913f4;p=product%2Fupstream%2Fcoreutils.git Fix smack rule copy at scratch box - remove checking dest fd's smack rule. Signed-off-by: DongHun Kwak Change-Id: I9dea3830c41f628d3a4cde469421e979817a3104 --- diff --git a/src/fs.h b/src/fs.h index 5ceea5b..fa69c8a 100644 --- a/src/fs.h +++ b/src/fs.h @@ -38,6 +38,7 @@ # define S_MAGIC_RAMFS 0x858458f6 # define S_MAGIC_SQUASHFS 0x73717368 # define S_MAGIC_SYSFS 0x62656572 +# define S_MAGIC_SMACK 0x43415D53 #elif defined __GNU__ # include #endif diff --git a/src/smack.h b/src/smack.h index 731ce70..cbc65e5 100644 --- a/src/smack.h +++ b/src/smack.h @@ -22,6 +22,7 @@ #include #include #include +#include #define SMACK_PATHTEXTSIZE 80 #define SMACK_LABELLEN 256 @@ -83,7 +84,11 @@ smack_of_file(const char *path, struct smack_attrs *result) i = lgetxattr(path, SMACK_ATTRNAME, result->attr, rlen); if (i < 0) - return i; + { + if ((errno == ENODATA) || (errno == ENOTSUP)) + return 0; + return i; + } if (i < rlen) result->attr[i] = '\0'; @@ -145,7 +150,11 @@ smack_of_fd(int fd, struct smack_attrs *result) i = fgetxattr(fd, SMACK_ATTRNAME, result->attr, rlen); if (i < 0) - return i; + { + if ((errno == ENODATA) || (errno == ENOTSUP)) + return 0; + return i; + } if (i < rlen) result->attr[i] = '\0';