--- a/usr/src/Makefile.lint	Sun Oct 30 17:59:05 2005 -0800
+++ b/usr/src/Makefile.lint	Mon Oct 31 11:33:35 2005 -0800
@@ -132,6 +132,7 @@
 	cmd/fs.d/udfs/mount \
 	cmd/fs.d/ufs/mount \
 	cmd/fs.d/ufs/fsirand\
+	cmd/fs.d/zfs/fstyp \
 	cmd/fuser \
 	cmd/gcore \
 	cmd/getconf \
@@ -272,12 +273,16 @@
 	cmd/xstr \
 	cmd/yes \
 	cmd/yppasswd \
+	cmd/zdb \
 	cmd/zdump \
+	cmd/zfs \
 	cmd/zlogin \
 	cmd/zoneadm \
 	cmd/zoneadmd \
 	cmd/zonecfg \
 	cmd/zonename \
+	cmd/zpool \
+	cmd/ztest \
 	lib/abi \
 	lib/auditd_plugins \
 	lib/crypt_modules \
@@ -349,6 +354,8 @@
 	lib/libwanboot \
 	lib/libwanbootutil \
 	lib/libxnet \
+	lib/libzfs \
+	lib/libzfs_jni \
 	lib/libzonecfg \
 	lib/libzoneinfo \
 	lib/lvm \

--- a/usr/src/Targetdirs	Sun Oct 30 17:59:05 2005 -0800
+++ b/usr/src/Targetdirs	Mon Oct 31 11:33:35 2005 -0800
@@ -81,6 +81,7 @@
 	/etc/dfs  \
 	/etc/fs  \
 	/etc/fs/nfs  \
+	/etc/fs/zfs \
 	/etc/ftpd  \
 	/etc/rpcsec	\
 	/etc/security	\
@@ -307,6 +308,7 @@
 	/usr/lib/fs \
 	/usr/lib/fs/nfs \
 	/usr/lib/fs/proc \
+	/usr/lib/fs/zfs \
 	/usr/lib/mdb \
 	/usr/lib/mdb/kvm \
 	/usr/lib/mdb/proc \

--- a/usr/src/cmd/Makefile	Sun Oct 30 17:59:05 2005 -0800
+++ b/usr/src/cmd/Makefile	Mon Oct 31 11:33:35 2005 -0800
@@ -49,6 +49,7 @@
 
 COMMON_SUBDIRS=		\
 	agents		\
+	availdevs	\
 	lp		\
 	perl		\
 	man		\
@@ -420,13 +421,17 @@
 	yes		\
 	ypcmd		\
 	yppasswd	\
+	zdb		\
 	zdump		\
+	zfs		\
 	zic		\
 	zlogin		\
 	zoneadm		\
 	zoneadmd	\
 	zonecfg		\
-	zonename
+	zonename	\
+	zpool		\
+	ztest
 
 i386_SUBDIRS=		\
 	addbadsec	\
@@ -664,12 +669,14 @@
 	xargs		\
 	yppasswd	\
 	zdump		\
+	zfs		\
 	zic		\
 	zlogin		\
 	zoneadm		\
 	zoneadmd	\
 	zonecfg		\
-	zonename
+	zonename	\
+	zpool
 
 sparc_MSGSUBDIRS=	\
 	fruadm		\

--- a/usr/src/cmd/allocate/Makefile	Sun Oct 30 17:59:05 2005 -0800
+++ b/usr/src/cmd/allocate/Makefile	Mon Oct 31 11:33:35 2005 -0800
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1989, 1998-2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -84,7 +84,7 @@
 
 $(ROOTSECLIB)/% :=		FILEMODE = 0751
 
-allocate :=	LDLIBS += -lbsm -lsecdb
+allocate :=	LDLIBS += -lbsm -lsec -lsecdb
 
 .KEEP_STATE:
 

--- a/usr/src/cmd/allocate/allocate3.c	Sun Oct 30 17:59:05 2005 -0800
+++ b/usr/src/cmd/allocate/allocate3.c	Mon Oct 31 11:33:35 2005 -0800
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1999-2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -255,24 +255,7 @@
 static int
 newdac(char *file, uid_t owner, gid_t group, o_mode_t mode)
 {
-	int	err = 0;
-	aclent_t	min_acl[MIN_ACL_ENTRIES];
-
-	min_acl[0].a_type = USER_OBJ;
-	min_acl[0].a_id   = owner;
-	min_acl[0].a_perm = ((mode & 0700) >> 6);
-
-	min_acl[1].a_type = GROUP_OBJ;
-	min_acl[1].a_id   = group;
-	min_acl[1].a_perm = ((mode & 0070) >> 3);
-
-	min_acl[2].a_type = CLASS_OBJ;
-	min_acl[2].a_id   = (uid_t)-1;
-	min_acl[2].a_perm = ((mode & 0070) >> 3);
-
-	min_acl[3].a_type = OTHER_OBJ;
-	min_acl[3].a_id   = (uid_t)-1;
-	min_acl[3].a_perm = (mode & 0007);
+	int		err = 0;
 
 	do {
 		if (chown(file, owner, group) == -1) {
@@ -281,7 +264,9 @@
 		}
 	} while (fdetach(file) == 0);
 
-	if (acl(file, SETACL, MIN_ACL_ENTRIES, min_acl) < 0) {
+	err = acl_strip(file, owner, group, (mode_t)mode);
+
+	if (err != 0) {
 		dperror("newdac, unable to setacl");
 		err = SETACL_PERR;
 	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/availdevs/Makefile	Mon Oct 31 11:33:35 2005 -0800
@@ -0,0 +1,65 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+PROG=		availdevs
+OBJS_COMMON=	availdevs.o
+OBJS=		$(OBJS_COMMON)
+SRCS=		$(OBJS_COMMON:%.o=%.c)
+
+include ../Makefile.cmd
+
+ROOTCMDDIR=	$(ROOTLIB)/zfs
+
+INCS += -I../../lib/libzfs_jni/common \
+	-I/usr/include/libxml2
+
+LDLIBS += -lzfs_jni -lxml2
+CPPFLAGS += $(INCS) -D_LARGEFILE64_SOURCE=1 -D_REENTRANT
+
+.KEEP_STATE:
+
+.PARALLEL:
+
+all: $(PROG)
+
+$(PROG): $(OBJS)
+	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
+	$(POST_PROCESS)
+
+%.o: %.c
+	$(COMPILE.c) -o $@ $<
+	$(POST_PROCESS_O)
+
+install: all $(ROOTCMD)
+
+clean:
+	$(RM) $(OBJS)
+
+FRC:
+
+include ../Makefile.targ

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/availdevs/availdevs.c	Mon Oct 31 11:33:35 2005 -0800
@@ -0,0 +1,158 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include "availdevs.h"
+#include <libzfs_jni_diskmgt.h>
+#include <libxml/parser.h>
+
+/*
+ * Function prototypes
+ */
+
+static void handle_error(const char *, va_list);
+static int add_disk_to_xml(dmgt_disk_t *, void *);
+static xmlDocPtr create_doc();
+int main();
+
+/*
+ * Static functions
+ */
+
+static void
+handle_error(const char *fmt, va_list ap)
+{
+	(void) vfprintf(stderr, fmt, ap);
+	(void) fprintf(stderr, "\n");
+}
+
+static int
+add_disk_to_xml(dmgt_disk_t *dp, void *data)
+{
+	int i, n;
+	char tmp[64];
+	xmlNodePtr available = *((xmlNodePtr *)data);
+
+	xmlNodePtr disk = xmlNewChild(
+	    available, NULL, (xmlChar *)ELEMENT_DISK, NULL);
+	xmlSetProp(disk,
+	    (xmlChar *)ATTR_DISK_NAME, (xmlChar *)dp->name);
+	n = snprintf(tmp, sizeof (tmp) - 1, "%llu", dp->size);
+	tmp[n] = '\0';
+	xmlSetProp(disk, (xmlChar *)ATTR_DISK_SIZE, (xmlChar *)tmp);
+
+	if (dp->aliases != NULL) {
+		for (i = 0; dp->aliases[i] != NULL; i++) {
+			xmlNodePtr alias = xmlNewChild(
+			    disk, NULL, (xmlChar *)ELEMENT_ALIAS, NULL);
+			xmlSetProp(alias,
+			    (xmlChar *)ATTR_ALIAS_NAME,
+			    (xmlChar *)dp->aliases[i]);
+		}
+	}
+
+	if (dp->slices != NULL) {
+		for (i = 0; dp->slices[i] != NULL; i++) {
+			dmgt_slice_t *sp = dp->slices[i];
+			xmlNodePtr slice = xmlNewChild(
+			    disk, NULL, (xmlChar *)ELEMENT_SLICE, NULL);
+			xmlSetProp(slice,
+			    (xmlChar *)ATTR_SLICE_NAME, (xmlChar *)sp->name);
+
+			n = snprintf(tmp, sizeof (tmp) - 1, "%llu", sp->size);
+			tmp[n] = '\0';
+			xmlSetProp(slice, (xmlChar *)ATTR_SLICE_SIZE,
+			    (xmlChar *)tmp);
+
+			n = snprintf(tmp, sizeof (tmp) - 1, "%llu", sp->start);
+			tmp[n] = '\0';
+			xmlSetProp(slice, (xmlChar *)ATTR_SLICE_START,
+			    (xmlChar *)tmp);
+
+			if (sp->used_name != NULL) {
+				xmlSetProp(slice,
+				    (xmlChar *)ATTR_SLICE_USED_NAME,
+				    (xmlChar *)sp->used_name);
+			}
+
+			if (sp->used_by != NULL) {
+				xmlSetProp(slice, (xmlChar *)ATTR_SLICE_USED_BY,
+				    (xmlChar *)sp->used_by);
+			}
+		}
+	}
+
+	return (0);
+}
+
+static xmlDocPtr
+create_doc(void)
+{
+	/* Create the XML document */
+	xmlDocPtr doc = xmlNewDoc((xmlChar *)"1.0");
+
+	/* Create the root node */
+	xmlNodePtr root = xmlNewDocNode(
+	    doc, NULL, (xmlChar *)ELEMENT_ROOT, NULL);
+	xmlAddChild((xmlNodePtr) doc, (xmlNodePtr)root);
+
+	/* Create the available node */
+	xmlNewChild(root, NULL, (xmlChar *)ELEMENT_AVAILABLE, NULL);
+
+	return (doc);
+}
+
+/*
+ * Main entry to availdisks.
+ *
+ * @return      0 on successful exit, non-zero otherwise
+ */
+int
+main(void)
+{
+	int error;
+	xmlDocPtr doc;
+	xmlNodePtr root;
+	xmlNodePtr available;
+
+	/* diskmgt.o error handler */
+	dmgt_set_error_handler(handle_error);
+
+	doc = create_doc();
+	root = xmlDocGetRootElement(doc);
+	available = xmlGetLastChild(root);
+
+	error = dmgt_avail_disk_iter(add_disk_to_xml, &available);
+	if (!error) {
+		/* Print out XML */
+		xmlDocFormatDump(stdout, doc, 1);
+	}
+
+	xmlFreeDoc(doc);
+
+	return (error != 0);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/availdevs/availdevs.h	Mon Oct 31 11:33:35 2005 -0800
@@ -0,0 +1,62 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _AVAILDEVS_H
+#define	_AVAILDEVS_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Constants
+ */
+
+/* Must match the values in XMLDataModel.java */
+#define	ELEMENT_ROOT			"zfsconfig"
+#define	ELEMENT_AVAILABLE		"available"
+#define	ELEMENT_DISK			"disk"
+#define	ELEMENT_ALIAS			"alias"
+#define	ELEMENT_SLICE			"slice"
+#define	ATTR_DISK_NAME			"name"
+#define	ATTR_DISK_SIZE			"size"
+#define	ATTR_DISK_INUSE			"inuse"
+#define	ATTR_ALIAS_NAME			"name"
+#define	ATTR_SLICE_NAME			"name"
+#define	ATTR_SLICE_SIZE			"size"
+#define	ATTR_SLICE_START		"start"
+#define	ATTR_SLICE_USED_NAME		"used-name"
+#define	ATTR_SLICE_USED_BY		"used-by"
+#define	VAL_ATTR_TRUE			"true"
+#define	VAL_ATTR_FALSE			"false"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _AVAILDEVS_H */

--- a/usr/src/cmd/bart/create.c	Sun Oct 30 17:59:05 2005 -0800
+++ b/usr/src/cmd/bart/create.c	Mon Oct 31 11:33:35 2005 -0800
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -31,6 +31,7 @@
 #include <sys/statvfs.h>
 #include <sys/wait.h>
 #include "bart.h"
+#include <aclutils.h>
 
 static int	sanitize_reloc_root(char *root, size_t bufsize);
 static int	create_manifest_filelist(char **argv, char *reloc_root);
@@ -623,46 +624,28 @@
 static char *
 get_acl_string(const char *fname, const struct stat64 *statb, int *err_code)
 {
-	aclent_t	*aclbuf;
-	int		num_acls, ret;
-	char		*acl_info;
+	acl_t		*aclp;
+	char		*acltext;
+	int		error;
 
 	if (S_ISLNK(statb->st_mode)) {
 		return (safe_strdup("-"));
 	}
 
-	/* First, figure out how many ACL entries this file has */
-	num_acls = acl(fname, GETACLCNT, 0, NULL);
-	if (num_acls < 0) {
-		*err_code = WARNING_EXIT;
-		perror(fname);
-		return (safe_strdup("-"));
-	}
+	/*
+	 *  Include trivial acl's
+	 */
+	error = acl_get(fname, 0, &aclp);
 
-	/*
-	 * Next, create a buffer which is big enough for all the ACL entries.
-	 * Then go get the raw data.
-	 */
-	aclbuf = (aclent_t *)safe_calloc(sizeof (aclent_t) * num_acls);
-	ret = acl(fname, GETACL, num_acls, aclbuf);
-	if (ret < 0) {
+	if (error != 0) {
 		*err_code = WARNING_EXIT;
-		perror(fname);
+		(void) fprintf(stderr, "%s: %s\n", fname, acl_strerror(error));
 		return (safe_strdup("-"));
+	} else {
+		acltext = acl_totext(aclp);
+		acl_free(aclp);
+		return (acltext);
 	}
-
-	/* Convert the raw entries to text */
-	acl_info = acltotext(aclbuf, num_acls);
-
-	/* Free up the buffer which held the raw ACL entries */
-	free(aclbuf);
-
-	if (acl_info == NULL) {
-		*err_code = WARNING_EXIT;
-		perror(fname);
-		return (safe_strdup("-"));
-	} else
-		return (acl_info);
 }
 
 

--- a/usr/src/cmd/chmod/Makefile	Sun Oct 30 17:59:05 2005 -0800
+++ b/usr/src/cmd/chmod/Makefile	Mon Oct 31 11:33:35 2005 -0800
@@ -22,7 +22,7 @@
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # cmd/chmod/Makefile
@@ -42,6 +42,8 @@
 
 LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2
 
+LDLIBS += -lsec
+
 POFILE= chmod_cmd.po
 XGETFLAGS= -a -x chmod.xcl
 

--- a/usr/src/cmd/chmod/chmod.c	Sun Oct 30 17:59:05 2005 -0800
+++ b/usr/src/cmd/chmod/chmod.c	Mon Oct 31 11:33:35 2005 -0800
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -44,6 +44,7 @@
  * chmod option mode files
  * where
  *	mode is [ugoa][+-=][rwxXlstugo] or an octal number
+ *	mode is [<+|->A[# <number] ]<aclspec>
  *	option is -R and -f
  */
 
@@ -63,8 +64,10 @@
 #include <string.h>	/* strerror() */
 #include <stdarg.h>
 #include <limits.h>
+#include <ctype.h>
 #include <errno.h>
 #include <sys/acl.h>
+#include <aclutils.h>
 
 static int	rflag;
 static int	fflag;
@@ -77,25 +80,38 @@
 
 static char	*ms;		/* Points to the mode argument */
 
+#define	ACL_ADD		1
+#define	ACL_DELETE	2
+#define	ACL_SLOT_DELETE 3
+#define	ACL_REPLACE	4
+#define	ACL_STRIP	5
+
+typedef struct acl_args {
+	acl_t	*acl_aclp;
+	int	acl_slot;
+	int	acl_action;
+} acl_args_t;
+
 extern mode_t
 newmode_common(char *ms, mode_t new_mode, mode_t umsk, char *file, char *path,
 	o_mode_t *group_clear_bits, o_mode_t *group_set_bits);
 
 static int
-dochmod(char *name, char *path, mode_t umsk),
-chmodr(char *dir, char *path, mode_t mode, mode_t umsk);
+dochmod(char *name, char *path, mode_t umsk, acl_args_t *aclp),
+chmodr(char *dir, char *path, mode_t mode, mode_t umsk, acl_args_t *aclp);
+static int doacl(char *file, struct stat *st, acl_args_t *aclp);
 
 static void handle_acl(char *name, o_mode_t group_clear_bits,
-	o_mode_t group_set_bits);
+    o_mode_t group_set_bits);
 
-static void
-usage(void);
+static void usage(void);
 
-void
-errmsg(int severity, int code, char *format, ...);
+void errmsg(int severity, int code, char *format, ...);
 
-static void
-parseargs(int ac, char *av[]);
+static void parseargs(int ac, char *av[]);
+
+int
+parse_acl_args(char *arg, acl_args_t **acl_args);
 
 int
 main(int argc, char *argv[])
@@ -103,6 +119,7 @@
 	int i, c;
 	int status = 0;
 	mode_t umsk;
+	acl_args_t *acl_args = NULL;
 
 	(void) setlocale(LC_ALL, "");
 #if !defined(TEXT_DOMAIN)	/* Should be defined by cc -D */
@@ -134,9 +151,16 @@
 	mac -= optind;
 	mav += optind;
 
-	if (mac < 2) {
-		usage();
-		exit(2);
+	if (mac >= 2 && (mav[0][0] == 'A')) {
+		if (parse_acl_args(*mav, &acl_args)) {
+			usage();
+			exit(2);
+		}
+	} else {
+		if (mac < 2) {
+			usage();
+			exit(2);
+		}
 	}
 
 	ms = mav[0];
@@ -144,14 +168,15 @@
 	umsk = umask(0);
 	(void) umask(umsk);
 
-	for (i = 1; i < mac; i++)
-		status += dochmod(mav[i], mav[i], umsk);
+	for (i = 1; i < mac; i++) {
+		status += dochmod(mav[i], mav[i], umsk, acl_args);
+	}
 
 	return (fflag ? 0 : status);
 }
 
 static int
-dochmod(char *name, char *path, mode_t umsk)
+dochmod(char *name, char *path, mode_t umsk, acl_args_t *aclp)
 {
 	static struct stat st;
 	int linkflg = 0;
@@ -172,9 +197,11 @@
 
 	/* Do not recurse if directory is object of symbolic link */
 	if (rflag && ((st.st_mode & S_IFMT) == S_IFDIR) && !linkflg)
-		return (chmodr(name, path, st.st_mode, umsk));
+		return (chmodr(name, path, st.st_mode, umsk, aclp));
 
-	if (chmod(name, newmode_common(ms, st.st_mode, umsk, name, path,
+	if (aclp) {
+		return (doacl(name, &st, aclp));
+	} else if (chmod(name, newmode_common(ms, st.st_mode, umsk, name, path,
 	    &group_clear_bits, &group_set_bits)) == -1) {
 		errmsg(2, 0, gettext("can't change %s\n"), path);
 		return (1);
@@ -195,7 +222,7 @@
 
 
 static int
-chmodr(char *dir, char *path,  mode_t mode, mode_t umsk)
+chmodr(char *dir, char *path,  mode_t mode, mode_t umsk, acl_args_t *aclp)
 {
 
 	DIR *dirp;
@@ -204,6 +231,7 @@
 	char currdir[PATH_MAX+1];		/* current dir name + '/' */
 	char parentdir[PATH_MAX+1];		/* parent dir name  + '/' */
 	int ecode;
+	struct stat st;
 	o_mode_t	group_clear_bits, group_set_bits;
 
 	if (getcwd(savedir, PATH_MAX) == 0)
@@ -213,7 +241,14 @@
 	/*
 	 * Change what we are given before doing it's contents
 	 */
-	if (chmod(dir, newmode_common(ms, mode, umsk, dir, path,
+	if (aclp) {
+		if (lstat(dir, &st) < 0) {
+			errmsg(2, 0, gettext("can't access %s\n"), path);
+			return (1);
+		}
+		if (doacl(dir, &st, aclp) != 0)
+			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);
@@ -226,8 +261,11 @@
 	 * permissions changes to both the acl mask and the
 	 * general group permissions.
 	 */
-	if (group_clear_bits || group_set_bits)
-		handle_acl(dir, group_clear_bits, group_set_bits);
+
+	if (aclp == NULL) { /* only necessary when not setting ACL */
+		if (group_clear_bits || group_set_bits)
+			handle_acl(dir, group_clear_bits, group_set_bits);
+	}
 
 	if (chdir(dir) < 0) {
 		errmsg(2, 0, "%s/%s: %s\n", savedir, dir, strerror(errno));
@@ -255,7 +293,7 @@
 	for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp))  {
 		(void) strcpy(currdir, parentdir);
 		(void) strcat(currdir, dp->d_name);
-		ecode += dochmod(dp->d_name, currdir, umsk);
+		ecode += dochmod(dp->d_name, currdir, umsk, aclp);
 	}
 	(void) closedir(dirp);
 	if (chdir(savedir) < 0) {
@@ -301,13 +339,26 @@
 	    "usage:\tchmod [-fR] <absolute-mode> file ...\n"));
 
 	(void) fprintf(stderr, gettext(
+	    "\tchmod [-fR] <ACL-operation> file ...\n"));
+
+	(void) fprintf(stderr, gettext(
 	    "\tchmod [-fR] <symbolic-mode-list> file ...\n"));
 
+
 	(void) fprintf(stderr, gettext(
 	    "where \t<symbolic-mode-list> is a comma-separated list of\n"));
 
 	(void) fprintf(stderr, gettext(
 	    "\t[ugoa]{+|-|=}[rwxXlstugo]\n"));
+
+	(void) fprintf(stderr, gettext(
+	    "where \t<ACL-operation> is one of the following\n"));
+	(void) fprintf(stderr, gettext("\tA-<acl_specification>\n"));
+	(void) fprintf(stderr, gettext("\tA[number]-\n"));
+	(void) fprintf(stderr, gettext(
+	    "\tA[number]{+|=}<acl_specification>\n"));
+	(void) fprintf(stderr, gettext(
+	    "where \t<acl-specification> is a comma-separated list of ACEs\n"));
 }
 
 /*
@@ -373,6 +424,74 @@
 	mav[mac] = (char *)NULL;
 }
 
+int
+parse_acl_args(char *arg, acl_args_t **acl_args)
+{
+	acl_t *new_acl = NULL;
+	int slot;
+	int error;
+	int len;
+	int action;
+	acl_args_t *new_acl_args;
+	char *acl_spec = NULL;
+	char *end;
+
+	if (arg[0] != 'A')
+		return (1);
+
+	slot = strtol(&arg[1], &end, 10);
+
+	len = strlen(arg);
+	switch (*end) {
+	case '+':
+		action = ACL_ADD;
+		acl_spec = ++end;
+		break;
+	case '-':
+		if (len == 2 && arg[0] == 'A' && arg[1] == '-')
+			action = ACL_STRIP;
+		else
+			action = ACL_DELETE;
+		if (action != ACL_STRIP) {
+			acl_spec = ++end;
+			if (acl_spec[0] == '\0') {
+				action = ACL_SLOT_DELETE;
+				acl_spec = NULL;
+			} else if (arg[1] != '-')
+				return (1);
+		}
+		break;
+	case '=':
+		action = ACL_REPLACE;
+		acl_spec = ++end;
+		break;
+	default:
+		return (1);
+	}
+
+	if ((action == ACL_REPLACE || action == ACL_ADD) && acl_spec[0] == '\0')
+		return (1);
+
+	if (acl_spec) {
+		if (error = acl_fromtext(acl_spec, &new_acl)) {
+			errmsg(1, 1, "%s\n", acl_strerror(error));
+			return (1);
+		}
+	}
+
+	new_acl_args = malloc(sizeof (acl_args_t));
+	if (new_acl_args == NULL)
+		return (1);
+
+	new_acl_args->acl_aclp = new_acl;
+	new_acl_args->acl_slot = slot;
+	new_acl_args->acl_action = action;
+
+	*acl_args = new_acl_args;
+
+	return (0);
+}
+
 /*
  * This function is called whenever the group permissions of a file
  * is being modified.  According to the chmod(1) manpage, any
@@ -388,6 +507,14 @@
 	aclent_t *aclp, *tp;
 	o_mode_t newperm;
 
+	/*
+	 * if this file system support ace_t acl's
+	 * then simply return since we don't have an
+	 * acl mask to deal with
+	 */
+	if (pathconf(name, _PC_ACL_ENABLED) == _ACL_ACE_ENABLED)
+		return;
+
 	if ((aclcnt = acl(name, GETACLCNT, 0, NULL)) <= MIN_ACL_ENTRIES)
 		return;	/* it's just a trivial acl; no need to change it */
 
@@ -424,3 +551,134 @@
 	}
 	free(aclp);
 }
+
+static int
+doacl(char *file, struct stat *st, acl_args_t *acl_args)
+{
+	acl_t *aclp;
+	acl_t *set_aclp;
+	int error = 0;
+	void *to, *from;
+	int len;
+	int isdir;
+
+	isdir = S_ISDIR(st->st_mode);
+
+	error = acl_get(file, 0, &aclp);
+
+	if (error != 0) {
+		errmsg(1, 1, "%s\n", acl_strerror(error));
+		return (1);
+	}
+
+	switch (acl_args->acl_action) {
+	case ACL_ADD:
+		if ((error = acl_addentries(aclp,
+			acl_args->acl_aclp, acl_args->acl_slot)) != 0) {
+				errmsg(1, 1, "%s\n", acl_strerror(error));
+				acl_free(aclp);
+				return (1);
+		}
+		set_aclp = aclp;
+		break;
+	case ACL_SLOT_DELETE:
+
+		if (acl_args->acl_slot + 1 > aclp->acl_cnt) {
+			errmsg(1, 1,
+			    gettext("Invalid slot specified for removal\n"));
+			acl_free(aclp);
+			return (1);
+		}
+
+		if (acl_args->acl_slot == 0 && aclp->acl_cnt == 1) {
+			errmsg(1, 1,
+			    gettext("Can't remove all ACL "
+			    "entries from a file\n"));
+			acl_free(aclp);
+			return (1);
+		}
+
+		/*
+		 * remove a single entry
+		 *
+		 * if last entry just adjust acl_cnt
+		 */
+
+		if ((acl_args->acl_slot + 1) == aclp->acl_cnt)
+			aclp->acl_cnt--;
+		else {
+			to = (char *)aclp->acl_aclp +
+			    (acl_args->acl_slot * aclp->acl_entry_size);
+			from = (char *)to + aclp->acl_entry_size;
+			len = (aclp->acl_cnt - acl_args->acl_slot - 1) *
+			    aclp->acl_entry_size;
+			(void) memmove(to, from, len);
+			aclp->acl_cnt--;
+		}
+		set_aclp = aclp;
+		break;
+
+	case ACL_DELETE:
+		if ((error = acl_removeentries(aclp, acl_args->acl_aclp,
+		    acl_args->acl_slot, ACL_REMOVE_ALL)) != 0) {
+			errmsg(1, 1, "%s\n", acl_strerror(error));
+			acl_free(aclp);
+			return (1);
+		}
+
+		if (aclp->acl_cnt == 0) {
+			errmsg(1, 1,
+			    gettext("Can't remove all ACL "
+			    "entries from a file\n"));
+			acl_free(aclp);
+			return (1);
+		}
+
+		set_aclp = aclp;
+		break;
+	case ACL_REPLACE:
+		if (acl_args->acl_slot >= 0)  {
+			error = acl_modifyentries(aclp, acl_args->acl_aclp,
+			    acl_args->acl_slot);
+			if (error) {
+				errmsg(1, 1, "%s\n", acl_strerror(error));
+				acl_free(aclp);
+				return (1);
+			}
+			set_aclp = aclp;
+		} else {
+			set_aclp = acl_args->acl_aclp;
+		}
+		break;
+	case ACL_STRIP:
+		error = acl_strip(file, st->st_uid, st->st_gid, st->st_mode);
+		if (error) {
+			errmsg(1, 1, "%s\n", acl_strerror(error));
+			return (1);
+		}
+		acl_free(aclp);
+		return (0);
+		/*NOTREACHED*/
+	default:
+		errmsg(1, 0, gettext("Unknown ACL action requested\n"));
+		return (1);
+		break;
+	}
+
+	error = acl_check(set_aclp, isdir);
+
+	if (error) {
+		errmsg(1, 0, "%s\n%s", acl_strerror(error),
+		    gettext("See chmod(1) for more information on "
+		    "valid ACL syntax\n"));
+		return (1);
+	}
+	if ((error = acl_set(file, set_aclp)) != 0) {
+			errmsg(1, 0, gettext("Failed to set ACL: %s\n"),
+			    acl_strerror(error));
+			acl_free(aclp);
+			return (1);
+	}
+	acl_free(aclp);
+	return (0);
+}

--- a/usr/src/cmd/cmd-inet/usr.bin/rcp.c	Sun Oct 30 17:59:05 2005 -0800
+++ b/usr/src/cmd/cmd-inet/usr.bin/rcp.c	Mon Oct 31 11:33:35 2005 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -52,6 +52,7 @@
 #include <sys/sendfile.h>
 #include <sys/sysmacros.h>
 #include <sys/wait.h>
+#include <aclutils.h>
 
 /*
  * It seems like Berkeley got these from pathnames.h?
@@ -83,6 +84,7 @@
 static int iamrecursive;
 static int targetshouldbedirectory;
 static int aclflag;
+static int acl_aclflag;
 static int retval = 0;
 static int portnumber = 0;
 
@@ -200,14 +202,14 @@
 	}
 
 	fflag = tflag = 0;
-	while ((ch = getopt(argc, argv, "axdfprtz:D:k:P:")) != EOF) {
+	while ((ch = getopt(argc, argv, "axdfprtz:D:k:P:Z")) != EOF) {
 		switch (ch) {
 		case 'd':
 			targetshouldbedirectory = 1;
 			break;
 		case 'f':			/* "from" */
 			fflag = 1;
-			if (aclflag)
+			if (aclflag | acl_aclflag)
 				/* ok response */
 				(void) desrcpwrite(rem, "", 1);
 			break;
@@ -220,6 +222,9 @@
 		case 't':			/* "to" */
 			tflag = 1;
 			break;
+		case 'Z':
+			acl_aclflag++;
+			break;
 		case 'x':
 			if (!krb5_privacy_allowed()) {
 				(void) fprintf(stderr, gettext("rcp: "
@@ -652,9 +657,7 @@
 				if (response() < 0)
 					exit(1);
 
-				}
-				else
-				{
+				} else {
 
 				/*
 				 * ACL support: try to find out if the remote
@@ -663,8 +666,13 @@
 				 * purpose.
 				 */
 				aclflag = 1;
+				acl_aclflag = 1;
 
-				(void) snprintf(bp, buffersize, "%s -t %s",
+				/*
+				 * First see if the remote side will support
+				 * both aclent_t and ace_t acl's?
+				 */
+				(void) snprintf(bp, buffersize, "%s -tZ %s",
 							cmd_sunw, targ);
 				rem = rcmd_af(&host, portnumber, pwd->pw_name,
 					    tuser ? tuser : pwd->pw_name,
@@ -681,32 +689,49 @@
 				    != sizeof (resp))
 					lostconn();
 				if (resp != 0) {
-					/*
-					 * Not OK:
-					 * The other side is running
-					 * non-acl rcp. Try again with
-					 * normal stuff
-					 */
-					aclflag = 0;
+					acl_aclflag = 0;
 					(void) snprintf(bp, buffersize,
-						"%s -t %s", cmd, targ);
+					    "%s -t %s", cmd_sunw, targ);
+
 					(void) close(rem);
 					host = thost;
 					rem = rcmd_af(&host, portnumber,
-							pwd->pw_name,
-							tuser ? tuser :
-							pwd->pw_name, bp, 0,
-							AF_INET6);
+					    pwd->pw_name,
+					    tuser ? tuser : pwd->pw_name,
+					    bp, 0, AF_INET6);
 					if (rem < 0)
 						exit(1);
-					if (response() < 0)
-						exit(1);
+
+					if (read(rem, &resp, sizeof (resp))
+					    != sizeof (resp))
+						lostconn();
+					if (resp != 0) {
+						/*
+						 * Not OK:
+						 * The other side is running
+						 * non-acl rcp. Try again with
+						 * normal stuff
+						 */
+						aclflag = 0;
+						(void) snprintf(bp, buffersize,
+						    "%s -t %s", cmd, targ);
+						(void) close(rem);
+						host = thost;
+						rem = rcmd_af(&host, portnumber,
+						    pwd->pw_name,
+						    tuser ? tuser :
+						    pwd->pw_name, bp, 0,
+						    AF_INET6);
+						if (rem < 0)
+							exit(1);
+						if (response() < 0)
+						    exit(1);
+					}
 				}
 				/* everything should be fine now */
 				(void) setuid(userid);
 
 				}
-
 			}
 			source(1, argv + i);
 		}
@@ -843,8 +868,9 @@
 		 * running acl cognizant version of rcp.
 		 */
 		aclflag = 1;
+		acl_aclflag = 1;
 
-		(void) snprintf(bp, buffersize, "%s -f %s", cmd_sunw, src);
+		(void) snprintf(bp, buffersize, "%s -Zf %s", cmd_sunw, src);
 		rem = rcmd_af(&host, portnumber, pwd->pw_name, suser,
 			    bp, 0, AF_INET6);
 
@@ -862,6 +888,24 @@
 		if (read(rem, &resp, sizeof (resp)) != sizeof (resp))
 			lostconn();
 		if (resp != 0) {
+
+			/*
+			 * Try again without ace_acl support
+			 */
+			acl_aclflag = 0;
+			(void) snprintf(bp, buffersize, "%s -f %s",
+			    cmd_sunw, src);
+			rem = rcmd_af(&host, portnumber, pwd->pw_name, suser,
+			    bp, 0, AF_INET6);
+
+			if (rem < 0) {
+				++errs;
+				continue;
+			}
+
+			if (read(rem, &resp, sizeof (resp)) != sizeof (resp))
+				lostconn();
+
 			/*
 			 * NOT ok:
 			 * The other side is running non-acl rcp.
@@ -1118,7 +1162,7 @@
 		}
 
 		/* ACL support: send */
-		if (aclflag) {
+		if (aclflag | acl_aclflag) {
 			/* get acl from f and send it over */
 			if (sendacl(f) == ACL_FAIL) {
 				(void) close(f);
@@ -1414,7 +1458,7 @@
 		if (buf[0] == 'D') {
 			if (exists) {
 				if ((stb.st_mode&S_IFMT) != S_IFDIR) {
-					if (aclflag) {
+					if (aclflag | acl_aclflag) {
 						/*
 						 * consume acl in the pipe
 						 * fd = -1 to indicate the
@@ -1439,7 +1483,7 @@
 			}
 
 			/* acl support for directories */
-			if (aclflag) {
+			if (aclflag | acl_aclflag) {
 				int dfd;
 
 				if ((dfd = open(np, O_RDONLY)) == -1)
@@ -1486,7 +1530,7 @@
 		/*
 		 * ACL support: receiving
 		 */
-		if (aclflag) {
+		if (aclflag | acl_aclflag) {
 			/* get acl and set it to ofd */
 			if (recvacl(ofd, exists, pflag) == ACL_FAIL) {
 				(void) close(ofd);
@@ -1733,49 +1777,78 @@
 sendacl(int f)
 {
 	int		aclcnt;
-	aclent_t	*aclbufp;
-	int		aclsize;
 	char		*acltext;
 	char		buf[BUFSIZ];
+	acl_t		*aclp;
+	char		acltype;
+	int		aclerror;
+	int		trivial;
 
-	if ((aclcnt = facl(f, GETACLCNT, 0, NULL)) < 0) {
-		error("can't get acl count \n");
+
+	aclerror = facl_get(f, ACL_NO_TRIVIAL, &aclp);
+	if (aclerror != 0) {
+		error("can't retrieve ACL: %s \n", acl_strerror(aclerror));
 		return (ACL_FAIL);
 	}
 
+	/*
+	 * if acl type is not ACLENT_T and were operating in acl_aclflag == 0
+	 * then don't do the malloc and facl(fd, getcntcmd,...);
+	 * since the remote side doesn't support alternate style ACL's.
+	 */
+
+	if (aclp && (acl_type(aclp) != ACLENT_T) && (acl_aclflag == 0)) {
+		aclcnt = MIN_ACL_ENTRIES;
+		acltype = 'A';
+		trivial = ACL_IS_TRIVIAL;
+	} else {
+
+		aclcnt = (aclp != NULL) ? acl_cnt(aclp) : 0;
+
+		if (aclp) {
+			acltype = (acl_type(aclp) != ACLENT_T) ? 'Z' : 'A';
+			aclcnt = acl_cnt(aclp);
+			trivial = (acl_flags(aclp) & ACL_IS_TRIVIAL);
+		} else {
+			acltype = 'A';
+			aclcnt = MIN_ACL_ENTRIES;
+			trivial = ACL_IS_TRIVIAL;
+		}
+
+	}
+
 	/* send the acl count over */
-	(void) snprintf(buf, sizeof (buf), "A%d\n", aclcnt);
+	(void) snprintf(buf, sizeof (buf), "%c%d\n", acltype, aclcnt);
 	(void) desrcpwrite(rem, buf, strlen(buf));
 
-	/* only send acl when it is non-trivial */
-	if (aclcnt > MIN_ACL_ENTRIES) {
-		aclsize = aclcnt * sizeof (aclent_t);
-		if ((aclbufp = (aclent_t *)malloc(aclsize)) == NULL) {
-			error("rcp: cant allocate memory: aclcnt %d\n",
-					aclcnt);
-			exit(1);
-		}
-		if (facl(f, GETACL, aclcnt, aclbufp) < 0) {
-			error("rcp: failed to get acl\n");
-			return (ACL_FAIL);
-		}
-		acltext = acltotext(aclbufp, aclcnt);
+	/*
+	 * only send acl when we have an aclp, which would
+	 * imply its not trivial.
+	 */
+	if (aclp && (trivial != ACL_IS_TRIVIAL)) {
+		acltext = acl_totext(aclp);
 		if (acltext == NULL) {
 			error("rcp: failed to convert to text\n");
+			acl_free(aclp);
 			return (ACL_FAIL);
 		}
 
 		/* send ACLs over: send the length first */
-		(void) snprintf(buf, sizeof (buf), "A%d\n", strlen(acltext));
+		(void) snprintf(buf, sizeof (buf), "%c%d\n",
+		    acltype, strlen(acltext));
 
 		(void) desrcpwrite(rem, buf, strlen(buf));
 		(void) desrcpwrite(rem, acltext, strlen(acltext));
 		free(acltext);
-		free(aclbufp);
-		if (response() < 0)
+		if (response() < 0) {
+			acl_free(aclp);
 			return (ACL_FAIL);
+		}
 
 	}
+
+	if (aclp)
+		acl_free(aclp);
 	return (ACL_OK);
 }
 
@@ -1783,7 +1856,7 @@
  * Use this routine to get acl entry count and acl text size (in bytes)
  */
 static int
-getaclinfo(int *cnt)
+getaclinfo(int *cnt, int *acltype)
 {
 	char		buf[BUFSIZ];
 	char		*cp;
@@ -1793,7 +1866,15 @@
 	cp = buf;
 	if (desrcpread(rem, cp, 1) <= 0)
 		return (ACL_FAIL);
-	if (*cp++ != 'A') {
+
+	switch (*cp++) {
+	case 'A':
+		*acltype = 0;
+		break;
+	case 'Z':
+		*acltype = 1;
+		break;
+	default:
 		error("rcp: expect an ACL record, but got %c\n", *cp);
 		return (ACL_FAIL);
 	}
@@ -1829,15 +1910,24 @@
 	int		j;
 	char		*tp;
 	char		*acltext;	/* external format */
-	aclent_t	*aclbufp;	/* internal format */
+	acl_t		*aclp;
+	int		acltype;
+	int		min_entries;
+	int		aclerror;
 
 	/* get acl count */
-	if (getaclinfo(&aclcnt) != ACL_OK)
+	if (getaclinfo(&aclcnt, &acltype) != ACL_OK)
 		return (ACL_FAIL);
 
-	if (aclcnt > MIN_ACL_ENTRIES) {
+	if (acltype == 0) {
+		min_entries = MIN_ACL_ENTRIES;
+	} else {
+		min_entries = 1;
+	}
+
+	if (aclcnt > min_entries) {
 		/* get acl text size */
-		if (getaclinfo(&aclsize) != ACL_OK)
+		if (getaclinfo(&aclsize, &acltype) != ACL_OK)
 			return (ACL_FAIL);
 		if ((acltext = malloc(aclsize + 1)) == NULL) {
 			error("rcp: cant allocate memory: %d\n", aclsize);
@@ -1858,19 +1948,21 @@
 		*tp = '\0';
 
 		if (preserve || !exists) {
-			aclbufp = aclfromtext(acltext, &aclcnt);
-			if (aclbufp == NULL) {
-				error("rcp: failed to parse acl\n");
+			aclerror = acl_fromtext(acltext, &aclp);
+			if (aclerror != 0) {
+				error("rcp: failed to parse acl : %s\n",
+				    acl_strerror(aclerror));
 				return (ACL_FAIL);
 			}
+
 			if (f != -1) {
-				if (facl(f, SETACL, aclcnt, aclbufp) < 0) {
+				if (facl_set(f, aclp) < 0) {
 					error("rcp: failed to set acl\n");
 					return (ACL_FAIL);
 				}
 			}
 			/* -1 means that just consume the data in the pipe */
-			free(aclbufp);
+			acl_free(aclp);
 		}
 		free(acltext);
 		(void) desrcpwrite(rem, "", 1);

--- a/usr/src/cmd/compress/Makefile	Sun Oct 30 17:59:05 2005 -0800
+++ b/usr/src/cmd/compress/Makefile	Mon Oct 31 11:33:35 2005 -0800
@@ -22,7 +22,7 @@
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -34,6 +34,7 @@
 
 CFLAGS += $(CCVERBOSE)
 CPPFLAGS += -D_FILE_OFFSET_BITS=64
+LDLIBS += -lsec
 
 all: $(PROG) 
 

--- a/usr/src/cmd/compress/compress.c	Sun Oct 30 17:59:05 2005 -0800
+++ b/usr/src/cmd/compress/compress.c	Mon Oct 31 11:33:35 2005 -0800
@@ -136,6 +136,7 @@
 #include <strings.h>
 #include <fcntl.h>
 #include <dirent.h>
+#include <aclutils.h>
 
 /*
  * Multi-byte handling for 'y' or 'n'
@@ -1602,8 +1603,8 @@
 {
 	mode_t mode;
 	struct utimbuf timep;
-	int aclcnt;
-	aclent_t *aclp;
+	acl_t *aclp;
+	int error;
 
 	if (fclose(outp)) {
 		perror(ofname);
@@ -1654,41 +1655,20 @@
 		if (chmod(ofname, mode))	 /* Copy modes */
 			perror(ofname);
 
-		/* Copy ACL info */
-		if ((aclcnt = acl(ifname, GETACLCNT, 0, NULL)) < 0) {
+		error = acl_get(ifname, ACL_NO_TRIVIAL, &aclp);
+		if (error != 0) {
 			(void) fprintf(stderr, gettext(
-			    "%s: failed to get acl count\n"),
-			    ifname);
+			    "%s: failed to retrieve acl : %s\n"),
+			    ifname, acl_strerror(error));
 			perm_stat = 1;
 		}
-		/*
-		 * Get ACL info: don't bother allocating space if
-		 * there are only standard permissions, i.e.,
-		 * ACL count < 4.
-		 */
-		if (aclcnt > MIN_ACL_ENTRIES) {
-			if ((aclp = (aclent_t *)malloc(
-			    sizeof (aclent_t) * aclcnt)) == NULL) {
-				(void) fprintf(stderr, gettext(
-				    "Insufficient memory\n"));
-				exit(1);
-			}
-			if (acl(ifname, GETACL, aclcnt, aclp) < 0) {
-				(void) fprintf(stderr, gettext(
-				    "%s: failed to get acl entries\n"),
-				    ifname);
-				perm_stat = 1;
-			} else {
-				if (acl(ofname, SETACL,
-				    aclcnt, aclp) < 0) {
-					(void) fprintf(stderr, gettext(
-					    "%s: failed to set acl "
-					    "entries\n"), ofname);
-					perm_stat = 1;
-				}
-			}
-			free(aclp);
+		if (aclp && (acl_set(ofname, aclp) < 0)) {
+			(void) fprintf(stderr, gettext("%s: failed to set acl "
+			    "entries\n"), ofname);
+			perm_stat = 1;
 		}
+		if (aclp)
+			acl_free(aclp);
 
 		/* Copy ownership */
 		(void) chown(ofname, ifstat->st_uid, ifstat->st_gid);

--- a/usr/src/cmd/cpio/cpio.c	Sun Oct 30 17:59:05 2005 -0800
+++ b/usr/src/cmd/cpio/cpio.c	Mon Oct 31 11:33:35 2005 -0800
@@ -66,6 +66,7 @@
 #include <libintl.h>
 #include <dirent.h>
 #include <limits.h>
+#include <aclutils.h>
 
 /*
  * Special kludge for off_t being a signed quantity.
@@ -170,7 +171,6 @@
 static int g_write(int, int, char *, unsigned);
 static int is_floppy(int);
 static int is_tape(int);
-static int append_secattr(char **, int *, int, char *, char);
 static void write_ancillary(char *secinfo, int len);
 static int remove_dir(char *);
 static int save_cwd(void);
@@ -477,9 +477,9 @@
 } *attr;
 
 static int	Pflag = 0;	/* flag indicates that acl is preserved */
-static int	aclcnt = 0;	/* acl entry count */
-static aclent_t *aclp = NULL;	/* pointer to ACL */
-static int	acl_set = 0;	/* True if an acl was set on the file */
+static int	acl_is_set = 0; /* True if an acl was set on the file */
+
+acl_t *aclp;
 
 /*
  *
@@ -595,7 +595,7 @@
 static struct xattr_buf	*xattr_linkp;
 static int 		xattrbadhead;	/* is extended attribute header bad? */
 
-static int	append_secattr(char **, int *, int, char *, char);
+static int	append_secattr(char **, int *, acl_t *);
 static void	write_ancillary(char *, int);
 
 /*
@@ -676,11 +676,10 @@
 				 * the next file.
 				 */
 				if (aclp != NULL) {
-					free(aclp);
-					aclcnt = 0;
+					acl_free(aclp);
 					aclp = NULL;
 				}
-				acl_set = 0;
+				acl_is_set = 0;
 			}
 			(void) memset(&Gen, 0, sizeof (Gen));
 		}
@@ -710,10 +709,9 @@
 				Hiddendir = 0;
 			}
 			if (aclp != NULL) {
-				free(aclp);
-				aclcnt = 0;
+				acl_free(aclp);
 				aclp = NULL;
-				acl_set = 0;
+				acl_is_set = 0;
 			}
 		}
 		write_trail();
@@ -736,10 +734,9 @@
 			}
 			passret = file_pass();
 			if (aclp != NULL) {
-				free(aclp);
-				aclcnt = 0;
+				acl_free(aclp);
 				aclp = NULL;
-				acl_set = 0;
+				acl_is_set = 0;
 			}
 			if (Gen.g_passdirfd != -1)
 				(void) close(Gen.g_passdirfd);
@@ -1577,9 +1574,9 @@
 		errno = 0;
 		if (!link(name1_p, name2_p)) {
 			if (aclp != NULL) {
-				free(aclp);
+				acl_free(aclp);
 				aclp = NULL;
-				acl_set = 0;
+				acl_is_set = 0;
 			}
 			cnt = 0;
 			break;
@@ -1709,16 +1706,16 @@
 			    "file %s\"", G_p->g_attrfnam_p);
 		}
 
-		acl_set = 0;
+		acl_is_set = 0;
 		if (Pflag && aclp != NULL) {
-			if (facl(dirfd, SETACL, aclcnt, aclp) < 0) {
+			if (facl_set(dirfd, aclp) < 0) {
 				msg(ERRN,
 				    "failed to set acl on attribute"
 				    " directory of %s ", G_p->g_attrfnam_p);
 			} else {
-				acl_set = 1;
-			}
-			free(aclp);
+				acl_is_set = 1;
+			}
+			acl_free(aclp);
 			aclp = NULL;
 		}
 
@@ -1754,18 +1751,18 @@
 			/* A file by the same name exists. */
 
 			/* Take care of ACLs */
-			acl_set = 0;
+			acl_is_set = 0;
 
 			if (Pflag && aclp != NULL) {
-				if (acl(nam_p, SETACL, aclcnt, aclp) < 0) {
+				if (acl_set(nam_p, aclp) < 0) {
 					msg(ERRN,
 					    "\"%s\": failed to set acl",
 					    nam_p);
 				} else {
-					acl_set = 1;
+					acl_is_set = 1;
 				}
 
-				free(aclp);
+				acl_free(aclp);
 				aclp = NULL;
 			}
 			if (Args & OCd) {
@@ -1829,17 +1826,17 @@
 			 * The file creation succeeded.  Take care of the ACLs.
 			 */
 
-			acl_set = 0;
+			acl_is_set = 0;
 
 			if (Pflag && aclp != NULL) {
-				if (acl(nam_p, SETACL, aclcnt, aclp) < 0) {
+				if (acl_set(nam_p, aclp) < 0) {
 					msg(ERRN,
 					    "\"%s\": failed to set acl", nam_p);
 				} else {
-					acl_set = 1;
+					acl_is_set = 1;
 				}
 
-				free(aclp);
+				acl_free(aclp);
 				aclp = NULL;
 			}
 
@@ -2206,8 +2203,7 @@
 			int	len = 0;
 
 			/* append security attributes */
-			if (append_secattr(&secinfo, &len, aclcnt,
-				(char *)aclp, UFSD_ACL) == -1) {
+			if (append_secattr(&secinfo, &len, aclp) == -1) {
 				msg(ERR,
 				    "can create security information");
 			}
@@ -2328,8 +2324,7 @@
 		int	len = 0;
 
 		/* append security attributes */
-		if ((append_secattr(&secinfo, &len, aclcnt, (char *)aclp,
-		    UFSD_ACL)) == -1)
+		if ((append_secattr(&secinfo, &len, aclp)) == -1)
 			msg(ERR, "can create security information");
 
 		/* call append_secattr() if more than one */
@@ -2926,8 +2921,7 @@
 			int	len = 0;
 
 			/* append security attributes */
-			if ((append_secattr(&secinfo, &len, aclcnt,
-			    (char *)aclp, UFSD_ACL)) == -1)
+			if ((append_secattr(&secinfo, &len, aclp)) == -1)
 				msg(ERR, "can create security information");
 
 			/* call append_secattr() if more than one */
@@ -3248,6 +3242,8 @@
 	char *preptr;
 	int k = 0;
 	int j;
+	int error;
+	int aclcnt;
 
 	Gen.g_nam_p = Nam_p;
 	do { /* hit == NONE && (Args & OCk) && Buffr.b_cnt > 0 */
@@ -3629,20 +3625,29 @@
 				attr = (struct sec_attr *)tp;
 				switch (attr->attr_type) {
 				case UFSD_ACL:
+				case ACE_ACL:
 					(void) sscanf(attr->attr_len, "%7lo",
 					    (ulong_t *)&aclcnt);
-				/* header is 8 */
+					/* header is 8 */
 					attrsize = 8 +
 					    strlen(&attr->attr_info[0])
 					    + 1;
-					aclp = aclfromtext(&attr->attr_info[0],
-					    &cnt);
-					if (aclp == NULL) {
-						msg(ERR, "aclfromtext failed");
+
+					error =
+					    acl_fromtext(&attr->attr_info[0],
+					    &aclp);
+
+					if (error != 0) {
+						msg(ERR,
+						    "aclfromtext failed: %s",
+						    acl_strerror(error));
+						bytes -= attrsize;
 						break;
 					}
-					if (aclcnt != cnt) {
+
+					if (aclcnt != acl_cnt(aclp)) {
 						msg(ERR, "acl count error");
+						bytes -= attrsize;
 						break;
 					}
 					bytes -= attrsize;
@@ -3909,21 +3914,10 @@
 	 * standard permissions, i.e. ACL count < 4
 	 */
 	if ((SrcSt.st_mode & Ftype) != S_IFLNK && Pflag) {
-		if ((aclcnt = acl(Gen.g_nam_p, GETACLCNT, 0, NULL)) < 0)
+		if (acl_get(Gen.g_nam_p, ACL_NO_TRIVIAL, &aclp) != 0)
 			msg(ERRN, "Error with acl() of \"%s\"", Gen.g_nam_p);
-		if (aclcnt > MIN_ACL_ENTRIES) {
-			aclp = e_zalloc(E_EXIT, sizeof (aclent_t) * aclcnt);
-
-			if (acl(Gen.g_nam_p, GETACL, aclcnt, aclp) < 0) {
-				msg(ERRN,
-				    "Error with getacl() of \"%s\"",
-				    Gen.g_nam_p);
-				free(aclp);
-				aclp = NULL;
-			}
-		}
+	}
 	/* else: only traditional permissions, so proceed as usual */
-	}
 	if (creat_hdr())
 		return (1);
 	else return (2);
@@ -4332,17 +4326,16 @@
 			if ((result = openat(dirfd, get_component(nam_p),
 			    O_CREAT|O_RDWR|O_TRUNC, (int)G_p->g_mode)) >= 0) {
 				/* acl support */
-				acl_set = 0;
+				acl_is_set = 0;
 				if (Pflag && aclp != NULL) {
-					if (facl(result, SETACL, aclcnt, aclp)
-					    < 0) {
+					if (facl_set(result, aclp) < 0) {
 						msg(ERRN,
 						    "\"%s\": failed to set acl",
 						    nam_p);
 					} else {
-						acl_set = 1;
+						acl_is_set = 1;
 					}
-					free(aclp);
+					acl_free(aclp);
 					aclp = NULL;
 				}
 				cnt = 0;
@@ -4879,7 +4872,7 @@
 		mode_t orig_mask, new_mask;
 		struct stat sbuf;
 
-		if (!(Pflag && acl_set)) {
+		if (!(Pflag && acl_is_set)) {
 			/* Acl was not set, so we must chmod */
 			if (LSTAT(dirfd, G_p->g_nam_p, &sbuf) == 0) {
 				if ((sbuf.st_mode & Ftype) != S_IFLNK) {
@@ -4927,7 +4920,7 @@
 			set_tym(dirfd, get_component(onam_p),
 			    G_p->g_mtime, G_p->g_mtime);
 		}
-		if (!acl_set) {
+		if (!acl_is_set) {
 			if (G_p->g_attrnam_p != (char *)NULL) {
 				error = fchmod(Ofile, (int)G_p->g_mode);
 			} else {
@@ -6636,11 +6629,9 @@
  */
 static int
 append_secattr(
-	char	**secinfo,	/* existing security info */
-	int	*secinfo_len,	/* length of existing security info */
-	int	size,		/* new attribute size: unit depends on type */
-	char	*attrp,		/* new attribute data pointer */
-	char	attr_type)	/* new attribute type */
+	char		**secinfo,	/* existing security info */
+	int		*secinfo_len,	/* length of existing security info */
+	acl_t		*aclp) 	/* new attribute data pointer */
 {
 	char	*new_secinfo;
 	char	*attrtext;
@@ -6648,14 +6639,15 @@
 	int	oldsize;
 
 	/* no need to add */
-	if (attrp == (char *)NULL) {
+	if (aclp == NULL) {
 		return (0);
 	}
 
-	switch (attr_type) {
-	case UFSD_ACL:
+	switch (acl_type(aclp)) {
+	case ACLENT_T:
+	case ACE_T:
 		/* LINTED alignment */
-		attrtext = acltotext((aclent_t *)attrp, size);
+		attrtext = acl_totext(aclp);
 		if (attrtext == NULL) {
 			(void) fprintf(stderr, "acltotext failed\n");
 			return (-1);
@@ -6667,9 +6659,10 @@
 			(void) fprintf(stderr, "can't allocate memory\n");
 			return (-1);
 		}
-		attr->attr_type = '1';		/* UFSD_ACL */
+		attr->attr_type = (acl_type(aclp) == ACLENT_T) ?
+		    UFSD_ACL : ACE_ACL;
 		/* acl entry count */
-		(void) sprintf(attr->attr_len, "%06o", size);
+		(void) sprintf(attr->attr_len, "%06o", acl_cnt(aclp));
 		(void) strcpy((char *)&attr->attr_info[0], attrtext);
 		free(attrtext);
 		break;
@@ -6853,11 +6846,10 @@
 	 * If aclp still exists then free it since it is was set when base
 	 * file was extracted.
 	 */
-	if (aclp != (aclent_t *)NULL) {
-		free(aclp);
-		aclcnt = 0;
+	if (aclp != NULL) {
+		acl_free(aclp);
 		aclp = NULL;
-		acl_set = 0;
+		acl_is_set = 0;
 	}
 
 	Gen.g_dirfd = attropen(G_p->g_nam_p, ".", O_RDONLY);
@@ -6943,24 +6935,11 @@
 				free(namep);
 				continue;
 			}
-			if ((aclcnt = facl(filefd, GETACLCNT,
-			    0, NULL)) < 0) {
+			if (facl_get(filefd, ACL_NO_TRIVIAL, &aclp) != 0) {
 				msg(ERRN,
 				    "Error with acl() on %s",
 				    Gen.g_nam_p);
 			}
-			if (aclcnt > MIN_ACL_ENTRIES) {
-				aclp = e_zalloc(E_EXIT,
-					sizeof (aclent_t) * aclcnt);
-
-				if (facl(filefd, GETACL, aclcnt, aclp) < 0) {
-					msg(ERRN,
-					    "Error with getacl() on %s",
-					    Gen.g_nam_p);
-					free(aclp);
-					aclp = NULL;
-				}
-			}
 			(void) close(filefd);
 		}
 		(void) creat_hdr();
@@ -6973,11 +6952,10 @@
 		Gen.g_attrfnam_p = (char *)NULL;
 		Gen.g_linktoattrfnam_p = (char *)NULL;
 		Gen.g_linktoattrnam_p = (char *)NULL;
-		if (aclp != (aclent_t *)NULL) {
-			free(aclp);
-			aclcnt = 0;
+		if (aclp != NULL) {
+			acl_free(aclp);
 			aclp = NULL;
-			acl_set = 0;
+			acl_is_set = 0;
 		}
 		free(namep);
 	}