summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorbasabi <none@none>2008-06-12 14:56:54 -0700
committerbasabi <none@none>2008-06-12 14:56:54 -0700
commit56798e90e16fea70fd1365ed1808375d9a4a17e3 (patch)
treea38d0d3bf68cf47205fdf927d5f996161b8503a6 /usr
parent29ab75c9a733dad2978c4860efd954b5625e3467 (diff)
downloadillumos-joyent-56798e90e16fea70fd1365ed1808375d9a4a17e3.tar.gz
6712850 ls complains "can't read ACL", but exits with status 0
Diffstat (limited to 'usr')
-rw-r--r--usr/src/cmd/ls/ls.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/src/cmd/ls/ls.c b/usr/src/cmd/ls/ls.c
index 00bd072a01..bcc4ad06c5 100644
--- a/usr/src/cmd/ls/ls.c
+++ b/usr/src/cmd/ls/ls.c
@@ -294,6 +294,7 @@ static void *xmalloc(size_t, struct lbuf *);
static void free_sysattr(struct lbuf *);
static nvpair_t *pair;
static nvlist_t *response;
+static int acl_err;
int
main(int argc, char *argv[])
@@ -693,6 +694,8 @@ main(int argc, char *argv[])
ep->lflags |= ISARG;
optind++;
nargs++; /* count good arguments stored in flist */
+ if (acl_err)
+ err = 2;
}
colwidth = fixedwidth + filewidth;
qsort(flist, (unsigned)nargs, sizeof (struct lbuf *),
@@ -1557,6 +1560,7 @@ gstat(char *file, int argfl, struct ditem *myparent)
gettext("ls: can't read ACL on %s: %s\n"),
file, acl_strerror(error));
rep->acl = ' ';
+ acl_err++;
return (rep);
}