From 0869073b7b2a487564eeec8ac1a71406d4e09bfd Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 1 Sep 2003 10:43:21 +0000
Subject: Fix bug 342.  Short version of --add now -a instead of -A. (This used
 to be commit 233568dd6b08d3dfb48a712b763dfc31c03b229d)

---
 docs/docbook/manpages/smbcacls.1.xml | 4 ++--
 source3/utils/smbcacls.c             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/docbook/manpages/smbcacls.1.xml b/docs/docbook/manpages/smbcacls.1.xml
index bb57ab563d..78980a6aec 100644
--- a/docs/docbook/manpages/smbcacls.1.xml
+++ b/docs/docbook/manpages/smbcacls.1.xml
@@ -23,7 +23,7 @@
 		<arg choice="req">filename</arg>
 		<arg choice="opt">-D acls</arg>
 		<arg choice="opt">-M acls</arg>
-		<arg choice="opt">-A acls</arg>
+		<arg choice="opt">-a acls</arg>
 		<arg choice="opt">-S acls</arg>
 		<arg choice="opt">-C name</arg>
 		<arg choice="opt">-G name</arg>
@@ -55,7 +55,7 @@
 
 	<variablelist>
 		<varlistentry>
-		<term>-A acls</term>
+		<term>-a acls</term>
 		<listitem><para>Add the ACLs specified to the ACL list.  Existing 
 		access control entries are unchanged. </para></listitem>
 		</varlistentry>
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index c90c042106..58ee57b5dd 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -751,7 +751,7 @@ static struct cli_state *connect_one(const char *share)
 		POPT_AUTOHELP
 		{ "delete", 'D', POPT_ARG_STRING, NULL, 'D', "Delete an acl", "ACL" },
 		{ "modify", 'M', POPT_ARG_STRING, NULL, 'M', "Modify an acl", "ACL" },
-		{ "add", 'A', POPT_ARG_STRING, NULL, 'A', "Add an acl", "ACL" },
+		{ "add", 'a', POPT_ARG_STRING, NULL, 'a', "Add an acl", "ACL" },
 		{ "set", 'S', POPT_ARG_STRING, NULL, 'S', "Set acls", "ACLS" },
 		{ "chown", 'C', POPT_ARG_STRING, NULL, 'C', "Change ownership of a file", "USERNAME" },
 		{ "chgrp", 'G', POPT_ARG_STRING, NULL, 'G', "Change group ownership of a file", "GROUPNAME" },
@@ -796,7 +796,7 @@ static struct cli_state *connect_one(const char *share)
 			mode = SMB_ACL_MODIFY;
 			break;
 
-		case 'A':
+		case 'a':
 			the_acl = smb_xstrdup(poptGetOptArg(pc));
 			mode = SMB_ACL_ADD;
 			break;
-- 
cgit