diff options
| author | Amrita Sadhukhan <Amrita.Sadhukhan@Sun.COM> | 2010-07-20 14:41:01 +0530 |
|---|---|---|
| committer | Amrita Sadhukhan <Amrita.Sadhukhan@Sun.COM> | 2010-07-20 14:41:01 +0530 |
| commit | e7436d5b2e5091184dcec042694b72ba2ba04229 (patch) | |
| tree | 37f11d7fe6eff112127fef4b3912cf547f8a2803 | |
| parent | 0c0a6af62832d15ce7ec0abc5a8b5c3747f0980c (diff) | |
| download | illumos-gate-e7436d5b2e5091184dcec042694b72ba2ba04229.tar.gz | |
6912531 chmod -R does not recurse into a subdirectory that isn't owned by the user
| -rw-r--r-- | usr/src/cmd/chmod/chmod.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/usr/src/cmd/chmod/chmod.c b/usr/src/cmd/chmod/chmod.c index 531c4bf3d2..30c3390967 100644 --- a/usr/src/cmd/chmod/chmod.c +++ b/usr/src/cmd/chmod/chmod.c @@ -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 @@ chmodr(char *dir, char *path, mode_t mode, mode_t umsk, sec_args_t *secp, 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); } /* |