diff --git a/libcli/security/sddl.c b/libcli/security/sddl.c
index 74e0f0dccae..ee024b2b0d7 100644
--- a/libcli/security/sddl.c
+++ b/libcli/security/sddl.c
@@ -326,7 +326,7 @@ static const struct flag_map ace_access_mask[] = {
 };
 
 static const struct flag_map decode_ace_access_mask[] = {
-	{ "FA", FILE_ALL_ACCESS },
+	{ "FA", FILE_GENERIC_ALL },
 	{ "FR", FILE_GENERIC_READ },
 	{ "FW", FILE_GENERIC_WRITE },
 	{ "FX", FILE_GENERIC_EXECUTE },
diff --git a/selftest/knownfail.d/sddl b/selftest/knownfail.d/sddl
index 1b4209843e4..516c33b372d 100644
--- a/selftest/knownfail.d/sddl
+++ b/selftest/knownfail.d/sddl
@@ -1,5 +1,4 @@
 ^samba.tests.sddl.+.SddlCanonical.test_sddl_D:.A;;FA;;;WD..none
 ^samba.tests.sddl.+.SddlNonCanonical.test_sddl_D:.A;;0x001f01ff;;;WD..A;;0x001f01ff;;;S-1-5-21-11111111-22222222-33333333-1001..A;;0x001f01ff;;;S-1+11522-more-characters.none
-^samba.tests.sddl.+.SddlNonCanonical.test_sddl_D:.A;;FAGX;;;SY..none
 ^samba.tests.sddl.+.SddlNonCanonical.test_sddl_O:LAG:BAD:P.A;OICI;0x1f01ff;;;BA..none
 ^samba.tests.sddl.+.SddlNonCanonical.test_sddl_O:S-1-5-21-2212615479-2695158682-2101375468-512G:S-1-5-21-2212615479-2695158682-2101375468-513D:P.A;+482-more-characters.none