1 files changed, 11 insertions, 2 deletions

diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 686db13ef0cf..3621c89dd2f2 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -354,8 +354,17 @@ setfile(struct stat *fs, int fd)
 		    fchflags(fd, fs->st_flags) :
 		    (islink ? lchflags(to.p_path, fs->st_flags) :
 		    chflags(to.p_path, fs->st_flags))) {
-			warn("chflags: %s", to.p_path);
-			rval = 1;
+			/*
+			 * NFS doesn't support chflags; ignore errors unless
+			 * there's reason to believe we're losing bits.  (Note,
+			 * this still won't be right if the server supports
+			 * flags and we were trying to *remove* flags on a file
+			 * that we copied, i.e., that we didn't create.)
+			 */
+			if (errno != EOPNOTSUPP || fs->st_flags != 0) {
+				warn("chflags: %s", to.p_path);
+				rval = 1;
+			}
 		}
 
 	return (rval);