summaryrefslogtreecommitdiffstats
path: root/cddl
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2014-01-01 01:23:40 +0000
committerdelphij <delphij@FreeBSD.org>2014-01-01 01:23:40 +0000
commitbc4b7f418637b15d51b0da64431854664eb92455 (patch)
tree06bd77fbf0dde23fff8a624629dc254bb6431186 /cddl
parent64782f1b07316f6e99ea521f768473f37d72ae02 (diff)
downloadFreeBSD-src-bc4b7f418637b15d51b0da64431854664eb92455.zip
FreeBSD-src-bc4b7f418637b15d51b0da64431854664eb92455.tar.gz
MFV r260152:
4208 Typo in zfs_main.c: "posxiuser" illumos/illumos-gate@f38cb554a534c6df738be3f4d23327e69888e634 Note: this is a stripped down version of Illumos change. MFC after: 2 weeks
Diffstat (limited to 'cddl')
-rw-r--r--cddl/contrib/opensolaris/cmd/zfs/zfs_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
index db3b3a0..67cb4f1 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
@@ -21,7 +21,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
* Copyright 2012 Milan Jurik. All rights reserved.
* Copyright (c) 2012, Joyent, Inc. All rights reserved.
* Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
@@ -2157,7 +2157,7 @@ static int us_type_bits[] = {
USTYPE_SMB_USR,
USTYPE_ALL
};
-static char *us_type_names[] = { "posixgroup", "posxiuser", "smbgroup",
+static char *us_type_names[] = { "posixgroup", "posixuser", "smbgroup",
"smbuser", "all" };
typedef struct us_node {
OpenPOWER on IntegriCloud