From 03d94b50e5728fbc47a129e3c005f0b3d3f5a08c Mon Sep 17 00:00:00 2001
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 14 Oct 2002 19:40:00 +0000
Subject: [PATCH] Teach mount(8) about MNT_ACLS for the purposes of mount
 options and mount option printing.

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, Network Associates Laboratories
---
 sbin/mount/mntopts.h | 4 +++-
 sbin/mount/mount.c   | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index c7cecf518550..8ca7cd51585b 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -58,6 +58,7 @@ struct mntopt {
 #define MOPT_SUIDDIR		{ "suiddir",	0, MNT_SUIDDIR, 0 }
 #define MOPT_SNAPSHOT		{ "snapshot",	0, MNT_SNAPSHOT, 0 }
 #define MOPT_MULTILABEL		{ "multilabel",	0, MNT_MULTILABEL, 0 }
+#define MOPT_ACLS		{ "acls",	0, MNT_ACLS, 0 }
 
 /* Control flags. */
 #define MOPT_FORCE		{ "force",	0, MNT_FORCE, 0 }
@@ -88,7 +89,8 @@ struct mntopt {
 	MOPT_UNION,							\
 	MOPT_NOCLUSTERR,						\
 	MOPT_NOCLUSTERW,						\
-	MOPT_MULTILABEL
+	MOPT_MULTILABEL,						\
+	MOPT_ACLS
 
 void getmntopts(const char *, const struct mntopt *, int *, int *);
 void rmslashes(char *, char *);
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 8eff3a8c2b22..f0daa5562e45 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -108,6 +108,7 @@ static struct opt {
 	{ MNT_SUIDDIR,		"suiddir" },
 	{ MNT_SOFTDEP,		"soft-updates" },
 	{ MNT_MULTILABEL,	"multilabel" },
+	{ MNT_ACLS,		"acls" },
 	{ 0, NULL }
 };
 
@@ -764,6 +765,7 @@ flags2opts(flags)
 	if (flags & MNT_NOSYMFOLLOW)	res = catopt(res, "nosymfollow");
 	if (flags & MNT_SUIDDIR)	res = catopt(res, "suiddir");
 	if (flags & MNT_MULTILABEL)	res = catopt(res, "multilabel");
+	if (flags & MNT_ACLS)		res = catopt(res, "acls");
 
 	return res;
 }