Mercurial > illumos > illumos-gate

changeset 12883:d5c0ca4a2e95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6912531 chmod -R does not recurse into a subdirectory that isn't owned by the user
author Amrita Sadhukhan <Amrita.Sadhukhan@Sun.COM>
date Tue, 20 Jul 2010 14:41:01 +0530
parents 5249b6635922
children 0124c84da000
files usr/src/cmd/chmod/chmod.c
diffstat 1 files changed, 3 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/chmod/chmod.c	Tue Jul 20 14:19:58 2010 +0530
+++ b/usr/src/cmd/chmod/chmod.c	Tue Jul 20 14:41:01 2010 +0530
@@ -19,8 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T			*/
@@ -37,8 +36,6 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * chmod option mode files
  * where
@@ -354,19 +351,15 @@
 			return (1);
 		}
 		if (secp->sec_type == SEC_ACL) {
-			if (doacl(dir, &st, secp->sec_acls) != 0)
-				return (1);
+			(void) doacl(dir, &st, secp->sec_acls);
 		} else if (secp->sec_type == SEC_ATTR) {
-			if (set_attrs(dir, attrnames, secp->sec_attrs) != 0) {
-				return (1);
-			}
+			(void) set_attrs(dir, attrnames, secp->sec_attrs);
 		} else {
 			return (1);
 		}
 	} else if (chmod(dir, newmode_common(ms, mode, umsk, dir, path,
 	    &group_clear_bits, &group_set_bits)) < 0) {
 		errmsg(2, 0, gettext("can't change %s\n"), path);
-		return (1);
 	}
 
 	/*