libcli/security: do not pad sddl flags with zeros

We don't see this happening on Windows.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

2 files changed, 118 insertions, 1 deletions

diff --git a/libcli/security/sddl.c b/libcli/security/sddl.c
index 93ff97abe21..cfd625da6ba 100644
--- a/libcli/security/sddl.c
+++ b/libcli/security/sddl.c
@@ -736,7 +736,7 @@ static char *sddl_transition_encode_ace(TALLOC_CTX *mem_ctx, const struct securi
 	sddl_mask = sddl_flags_to_string(tmp_ctx, ace_access_mask,
 					 ace->access_mask, true);
 	if (sddl_mask == NULL) {
-		sddl_mask = talloc_asprintf(tmp_ctx, "0x%08x",
+		sddl_mask = talloc_asprintf(tmp_ctx, "0x%x",
 					     ace->access_mask);
 		if (sddl_mask == NULL) {
 			goto failed;
diff --git a/selftest/knownfail.d/sddl-sid-misc b/selftest/knownfail.d/sddl-sid-misc
new file mode 100644
index 00000000000..7e63b4c3e27
--- /dev/null
+++ b/selftest/knownfail.d/sddl-sid-misc
@@ -0,0 +1,117 @@
+^samba.tests.ntacls.+.NtaclsTests.test_setntacl_getntacl.none
+^samba.tests.ntacls.+.NtaclsTests.test_setntacl_getntacl_param.none
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_getposixacl.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_getposixacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_invalidate_getntacl.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_invalidate_getntacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_invalidate_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_invalidate_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_policies_check_getposixacl.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_policies_check_getposixacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_policies_dir_check_getposixacl.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_policies_dir_check_getposixacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_smbd_getntacl.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_smbd_getntacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_smbd_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_smbd_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_smbd_getntacl_smbd_gpo.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_smbd_getntacl_smbd_gpo.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_smbd_invalidate_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_smbd_invalidate_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_smbd_setposixacl_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_smbd_setposixacl_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_smbd_setposixacl_group_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_smbd_setposixacl_group_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_sysvol_check_getposixacl.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_sysvol_check_getposixacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_sysvol_dir_check_getposixacl.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setntacl_sysvol_dir_check_getposixacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setposixacl_dir_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setposixacl_dir_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setposixacl_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setposixacl_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setposixacl_group_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.PosixAclMappingTests.test_setposixacl_group_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_getposixacl.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_getposixacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_invalidate_getntacl.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_invalidate_getntacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_invalidate_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_invalidate_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_policies_check_getposixacl.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_policies_check_getposixacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_policies_dir_check_getposixacl.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_policies_dir_check_getposixacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_smbd_getntacl.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_smbd_getntacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_smbd_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_smbd_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_smbd_getntacl_smbd_gpo.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_smbd_getntacl_smbd_gpo.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_smbd_invalidate_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_smbd_invalidate_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_smbd_setposixacl_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_smbd_setposixacl_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_smbd_setposixacl_group_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_smbd_setposixacl_group_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_sysvol_check_getposixacl.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_sysvol_check_getposixacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_sysvol_dir_check_getposixacl.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setntacl_sysvol_dir_check_getposixacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setposixacl_dir_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setposixacl_dir_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setposixacl_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setposixacl_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setposixacl_group_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.SessionedPosixAclMappingTests.test_setposixacl_group_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_getposixacl.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_getposixacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_invalidate_getntacl.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_invalidate_getntacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_invalidate_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_invalidate_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_policies_check_getposixacl.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_policies_check_getposixacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_policies_dir_check_getposixacl.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_policies_dir_check_getposixacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_smbd_getntacl.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_smbd_getntacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_smbd_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_smbd_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_smbd_getntacl_smbd_gpo.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_smbd_getntacl_smbd_gpo.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_smbd_invalidate_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_smbd_invalidate_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_smbd_setposixacl_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_smbd_setposixacl_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_smbd_setposixacl_group_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_smbd_setposixacl_group_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_sysvol_check_getposixacl.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_sysvol_check_getposixacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_sysvol_dir_check_getposixacl.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setntacl_sysvol_dir_check_getposixacl.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setposixacl_dir_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setposixacl_dir_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setposixacl_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setposixacl_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setposixacl_group_getntacl_smbd.ad_dc:local
+^samba.tests.posixacl.+.UnixSessionedPosixAclMappingTests.test_setposixacl_group_getntacl_smbd.ad_dc_no_nss:local
+^samba.tests.samba_tool.ntacl.samba.tests.samba_tool.ntacl.NtACLCmdChangedomsidTestCase.test_ntvfs_check.ad_dc:local
+^samba.tests.samba_tool.ntacl.samba.tests.samba_tool.ntacl.NtACLCmdChangedomsidTestCase.test_s3fs_check.ad_dc:local
+^samba.tests.samba_tool.ntacl.samba.tests.samba_tool.ntacl.NtACLCmdGetSetTestCase.test_ntvfs_check.ad_dc:local
+^samba.tests.samba_tool.ntacl.samba.tests.samba_tool.ntacl.NtACLCmdGetSetTestCase.test_s3fs_check.ad_dc:local
+^samba.tests.samba_tool.ntacl.samba.tests.samba_tool.ntacl.NtACLCmdSysvolTestCase.test_ntvfs_check.ad_dc:local
+^samba.tests.samba_tool.ntacl.samba.tests.samba_tool.ntacl.NtACLCmdSysvolTestCase.test_s3fs_check.ad_dc:local
+^samba.tests.samba_tool.ntacl.samba.tests.samba_tool.ntacl.NtACLCmdSysvolTestCase.test_with_missing_files.ad_dc:local
+^samba3.blackbox.large_acl.NT1.able.to.retrieve.a.large.ACL.if.VFS.supports.it.fileserver_smb1_done
+^samba3.blackbox.large_acl.SMB3.able.to.retrieve.a.large.ACL.if.VFS.supports.it.fileserver
+^samba4.blackbox.samba-tool_ntacl.ad_member:local..changedomsid.ad_member:local
+^samba4.blackbox.samba-tool_ntacl.ad_member:local..changedomsid_ntvfs.ad_member:local
+^samba4.blackbox.samba-tool_ntacl.ad_member:local..get_ntacl.ad_member:local
+^samba4.blackbox.samba-tool_ntacl.ad_member:local..get_ntacl_ntvfs.ad_member:local