Module Name:    src
Committed By:   manu
Date:           Thu Aug 18 08:11:59 UTC 2011

Modified Files:
        src/bin/cp: cp.c

Log Message:
Remove warning about system extended attributes that cannot be copied, since
it will always be displayed when an unprivilegied user moves files across
filesystems (mv(1) uses cp -p in that case). After all, there is no warning
that we loose a setuid bit during a move or copy, so this makes sense.

Fixes bin/45259


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/bin/cp/cp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/cp/cp.c
diff -u src/bin/cp/cp.c:1.56 src/bin/cp/cp.c:1.57
--- src/bin/cp/cp.c:1.56	Wed Aug  3 04:11:15 2011
+++ src/bin/cp/cp.c	Thu Aug 18 08:11:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cp.c,v 1.56 2011/08/03 04:11:15 manu Exp $ */
+/* $NetBSD: cp.c,v 1.57 2011/08/18 08:11:58 manu Exp $ */
 
 /*
  * Copyright (c) 1988, 1993, 1994
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)cp.c	8.5 (Berkeley) 4/29/95";
 #else
-__RCSID("$NetBSD: cp.c,v 1.56 2011/08/03 04:11:15 manu Exp $");
+__RCSID("$NetBSD: cp.c,v 1.57 2011/08/18 08:11:58 manu Exp $");
 #endif
 #endif /* not lint */
 
@@ -197,13 +197,6 @@
 	myumask = umask(0);
 	(void)umask(myumask);
 
-	/* 
-	 * Warn that system extended attributes will not be preserved 
-	 * if not root
-	 */
-	if ((myuid != 0) && pflag)
-		warnx("system extended attribute will not be preserved");
-
 	/* Save the target base in "to". */
 	target = argv[--argc];
 	if (strlcpy(to.p_path, target, sizeof(to.p_path)) >= sizeof(to.p_path))

Reply via email to