Index: source/smbd/posix_acls.c
===================================================================
--- source/smbd/posix_acls.c	(revision 1313)
+++ source/smbd/posix_acls.c	(working copy)
@@ -180,7 +180,7 @@
 
 	entry_offset = pai_buf + PAI_ENTRIES_BASE;
 
-	for (ace_list = dir_ace_list; ace_list; ace_list = ace_list->next) {
+	for (ace_list = file_ace_list; ace_list; ace_list = ace_list->next) {
 		if (ace_list->inherited) {
 			uint8 type_val = (unsigned char)ace_list->owner_type;
 			uint32 entry_val = get_entry_val(ace_list);
@@ -191,7 +191,7 @@
 		}
 	}
 
-	for (ace_list = file_ace_list; ace_list; ace_list = ace_list->next) {
+	for (ace_list = dir_ace_list; ace_list; ace_list = ace_list->next) {
 		if (ace_list->inherited) {
 			uint8 type_val = (unsigned char)ace_list->owner_type;
 			uint32 entry_val = get_entry_val(ace_list);
Index: source/utils/smbcacls.c
===================================================================
--- source/utils/smbcacls.c	(revision 1313)
+++ source/utils/smbcacls.c	(working copy)
@@ -750,7 +750,7 @@
 		{ "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" },
-		{ "numeric", 0, POPT_ARG_NONE, &numeric, True, "Don't resolve sids or masks to names" },
+		{ "numeric", 'n', POPT_ARG_NONE, &numeric, True, "Don't resolve sids or masks to names" },
 		{ "test-args", 't', POPT_ARG_NONE, &test_args, True, "Test arguments"},
 		POPT_COMMON_SAMBA
 		POPT_COMMON_CREDENTIALS