torture: Move sddl tests to python

This kind of test is better hosted in python than in C. More lines,
but the ones in source4/libcli/security/tests/sddl.c were preeetty
long...

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/python/samba/tests/sddl.py b/python/samba/tests/sddl.py
new file mode 100644 (file)
index 0000000..006a49d
--- /dev/null
+++ b/python/samba/tests/sddl.py
@@ -0,0 +1,180 @@
+# Unix SMB/CIFS implementation.
+# Copyright (C) Volker Lendecke <vl@samba.org> 2021
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""Tests for samba.dcerpc.security"""
+
+from samba.dcerpc import security
+from samba.ndr import ndr_pack, ndr_unpack
+from samba.tests import TestCase
+
+class SddlDecodeEncode(TestCase):
+    strings = [
+        "D:(A;;CC;;;BA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)",
+
+        "D:(A;;GA;;;SY)",
+
+        "D:(A;;GA;;;RS)",
+
+        "D:(A;;RP;;;WD)"
+        "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;ED)"
+        "(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;ED)"
+        "(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;ED)"
+        "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;BA)"
+        "(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;BA)"
+        "(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;BA)"
+        "(A;;RPLCLORC;;;AU)"
+        "(A;;RPWPCRLCLOCCRCWDWOSW;;;DA)"
+        "(A;CI;RPWPCRLCLOCCRCWDWOSDSW;;;BA)"
+        "(A;;RPWPCRLCLOCCDCRCWDWOSDDTSW;;;SY)"
+        "(A;CI;RPWPCRLCLOCCDCRCWDWOSDDTSW;;;EA)"
+        "(A;CI;LC;;;RU)"
+        "(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;bf967aba-0de6-11d0-a285-00aa003049e2;RU)"
+        "(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)"
+        "(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)"
+        "(OA;CIIO;RP;4c164200-20c0-11d0-a768-00aa006e0529;bf967aba-0de6-11d0-a285-00aa003049e2;RU)"
+        "(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)"
+        "(OA;;RP;c7407360-20bf-11d0-a768-00aa006e0529;;RU)"
+        "(OA;CIIO;RPLCLORC;;bf967a9c-0de6-11d0-a285-00aa003049e2;RU)"
+        "(A;;RPRC;;;RU)"
+        "(OA;CIIO;RPLCLORC;;bf967aba-0de6-11d0-a285-00aa003049e2;RU)"
+        "(A;;LCRPLORC;;;ED)"
+        "(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;4828CC14-1437-45bc-9B07-AD6F015E5F28;RU)"
+        "(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;4828CC14-1437-45bc-9B07-AD6F015E5F28;RU)"
+        "(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;4828CC14-1437-45bc-9B07-AD6F015E5F28;RU)"
+        "(OA;CIIO;RP;4c164200-20c0-11d0-a768-00aa006e0529;4828CC14-1437-45bc-9B07-AD6F015E5F28;RU)"
+        "(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;4828CC14-1437-45bc-9B07-AD6F015E5F28;RU)"
+        "(OA;CIIO;RPLCLORC;;4828CC14-1437-45bc-9B07-AD6F015E5F28;RU)"
+        "(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;RU)"
+        "(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;AU)"
+        "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967aba-0de6-11d0-a285-00aa003049e2;ED)"
+        "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a9c-0de6-11d0-a285-00aa003049e2;ED)"
+        "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a86-0de6-11d0-a285-00aa003049e2;ED)"
+        "(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;DD)"
+        "(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;BA)"
+        "(OA;;CR;e2a36dc9-ae17-47c3-b58b-be34c55ba633;;S-1-5-32-557)"
+        "(OA;;CR;280f369c-67c7-438e-ae98-1d46f3c6f541;;AU)"
+        "(OA;;CR;ccc2dc7d-a6ad-4a7a-8846-c04e3cc53501;;AU)"
+        "(OA;;CR;05c74c5e-4deb-43b4-bd9f-86664c2a7fd5;;AU)S:(AU;SA;WDWOWP;;;WD)"
+        "(AU;SA;CR;;;BA)"
+        "(AU;SA;CR;;;DU)"
+        "(OU;CISA;WP;f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)"
+        "(OU;CISA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)",
+        "D:(A;;RPLCLORC;;;DA)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPLCLORC;;;AU)",
+
+        "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;AO)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPCRLCLORCSDDT;;;CO)"
+        "(OA;;WP;4c164200-20c0-11d0-a768-00aa006e0529;;CO)"
+        "(A;;RPLCLORC;;;AU)"
+        "(OA;;CR;ab721a53-1e2f-11d0-9819-00aa0040529b;;WD)"
+        "(A;;CCDC;;;PS)"
+        "(OA;;CCDC;bf967aa8-0de6-11d0-a285-00aa003049e2;;PO)"
+        "(OA;;RPWP;bf967a7f-0de6-11d0-a285-00aa003049e2;;CA)"
+        "(OA;;SW;f3a64788-5306-11d1-a9c5-0000f80367c1;;PS)"
+        "(OA;;RPWP;77B5B886-944A-11d1-AEBD-0000F80367C1;;PS)"
+        "(OA;;SW;72e39547-7b18-11d1-adef-00c04fd8d5cd;;PS)"
+        "(OA;;SW;72e39547-7b18-11d1-adef-00c04fd8d5cd;;CO)"
+        "(OA;;SW;f3a64788-5306-11d1-a9c5-0000f80367c1;;CO)"
+        "(OA;;WP;3e0abfd0-126a-11d0-a060-00aa006c33ed;bf967a86-0de6-11d0-a285-00aa003049e2;CO)"
+        "(OA;;WP;5f202010-79a5-11d0-9020-00c04fc2d4cf;bf967a86-0de6-11d0-a285-00aa003049e2;CO)"
+        "(OA;;WP;bf967950-0de6-11d0-a285-00aa003049e2;bf967a86-0de6-11d0-a285-00aa003049e2;CO)"
+        "(OA;;WP;bf967953-0de6-11d0-a285-00aa003049e2;bf967a86-0de6-11d0-a285-00aa003049e2;CO)"
+        "(OA;;RP;46a9b11d-60ae-405a-b7e8-ff8a58d456d2;;S-1-5-32-560)",
+
+        "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPLCLORC;;;AU)",
+        "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPLCLORC;;;AU)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;AO)"
+        "(A;;RPLCLORC;;;PS)"
+        "(OA;;CR;ab721a55-1e2f-11d0-9819-00aa0040529b;;AU)"
+        "(OA;;RP;46a9b11d-60ae-405a-b7e8-ff8a58d456d2;;S-1-5-32-560)",
+        "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPLCLORC;;;AU)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;CO)",
+
+        "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPLCLORC;;;AU)S:(AU;SA;CRWP;;;WD)",
+
+        "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;AO)"
+        "(A;;RPLCLORC;;;PS)"
+        "(OA;;CR;ab721a53-1e2f-11d0-9819-00aa0040529b;;PS)"
+        "(OA;;CR;ab721a54-1e2f-11d0-9819-00aa0040529b;;PS)"
+        "(OA;;CR;ab721a56-1e2f-11d0-9819-00aa0040529b;;PS)"
+        "(OA;;RPWP;77B5B886-944A-11d1-AEBD-0000F80367C1;;PS)"
+        "(OA;;RPWP;E45795B2-9455-11d1-AEBD-0000F80367C1;;PS)"
+        "(OA;;RPWP;E45795B3-9455-11d1-AEBD-0000F80367C1;;PS)"
+        "(OA;;RP;037088f8-0ae1-11d2-b422-00a0c968f939;;RS)"
+        "(OA;;RP;4c164200-20c0-11d0-a768-00aa006e0529;;RS)"
+        "(OA;;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;;RS)"
+        "(A;;RC;;;AU)"
+        "(OA;;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;;AU)"
+        "(OA;;RP;77B5B886-944A-11d1-AEBD-0000F80367C1;;AU)"
+        "(OA;;RP;E45795B3-9455-11d1-AEBD-0000F80367C1;;AU)"
+        "(OA;;RP;e48d0154-bcf8-11d1-8702-00c04fb96050;;AU)"
+        "(OA;;CR;ab721a53-1e2f-11d0-9819-00aa0040529b;;WD)"
+        "(OA;;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;;RS)"
+        "(OA;;RPWP;bf967a7f-0de6-11d0-a285-00aa003049e2;;CA)"
+        "(OA;;RP;46a9b11d-60ae-405a-b7e8-ff8a58d456d2;;S-1-5-32-560)"
+        "(OA;;WPRP;6db69a1c-9422-11d1-aebd-0000f80367c1;;S-1-5-32-561)",
+
+        "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)",
+
+        "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPLCLORC;;;AU)"
+        "(A;;LCRPLORC;;;ED)",
+
+        "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)"
+        "(OA;;CCDC;bf967a86-0de6-11d0-a285-00aa003049e2;;AO)"
+        "(OA;;CCDC;bf967aba-0de6-11d0-a285-00aa003049e2;;AO)"
+        "(OA;;CCDC;bf967a9c-0de6-11d0-a285-00aa003049e2;;AO)"
+        "(OA;;CCDC;bf967aa8-0de6-11d0-a285-00aa003049e2;;PO)"
+        "(A;;RPLCLORC;;;AU)"
+        "(A;;LCRPLORC;;;ED)"
+        "(OA;;CCDC;4828CC14-1437-45bc-9B07-AD6F015E5F28;;AO)",
+        "D:(A;;RPWPCRCCDCLCLORCWOWDSW;;;DA)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPLCLORC;;;AU)",
+
+        "D:(A;CI;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPLCLORC;;;AU)",
+
+        "D:S:",
+
+        "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPLCLORC;;;AU)"
+    ]
+
+    def test(self):
+        sid = security.dom_sid("S-1-2-3-4")
+        for s in self.strings:
+            sd = security.descriptor.from_sddl(s, sid)
+            sddl = sd.as_sddl(sid)
+            sd2 = security.descriptor.from_sddl(sddl, sid)
+            self.assertEqual(sd, sd2)

diff --git a/source4/libcli/security/tests/sddl.c b/source4/libcli/security/tests/sddl.c
deleted file mode 100644 (file)
index 58bb948..0000000
--- a/source4/libcli/security/tests/sddl.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   local testing of SDDL parsing
-
-   Copyright (C) Andrew Tridgell 2005
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "libcli/security/security.h"
-#include "torture/torture.h"
-#include "torture/local/proto.h"
-#include "librpc/gen_ndr/ndr_security.h"
-
-
-/*
-  test one SDDL example
-*/
-static bool test_sddl(struct torture_context *tctx, 
-                                         const void *test_data)
-{
-       struct security_descriptor *sd, *sd2;
-       struct dom_sid *domain;
-       const char *sddl = (const char *)test_data;
-       const char *sddl2;
-       TALLOC_CTX *mem_ctx = tctx;
-
-
-       domain = dom_sid_parse_talloc(mem_ctx, "S-1-2-3-4");
-       sd = sddl_decode(mem_ctx, sddl, domain);
-       torture_assert(tctx, sd != NULL, talloc_asprintf(tctx, 
-                                       "Failed to decode '%s'\n", sddl));
-
-       sddl2 = sddl_encode(mem_ctx, sd, domain);
-       torture_assert(tctx, sddl2 != NULL, talloc_asprintf(tctx, 
-                                       "Failed to re-encode '%s'\n", sddl));
-
-       sd2 = sddl_decode(mem_ctx, sddl2, domain);
-       torture_assert(tctx, sd2 != NULL, talloc_asprintf(tctx, 
-                                       "Failed to decode2 '%s'\n", sddl2));
-
-       torture_assert(tctx, security_descriptor_equal(sd, sd2),
-               talloc_asprintf(tctx, "Failed equality test for '%s'\n", sddl));
-
-#if 0
-       /* flags don't have a canonical order ... */
-       if (strcmp(sddl, sddl2) != 0) {
-               printf("Failed sddl equality test\norig: %s\n new: %s\n", sddl, sddl2);
-       }
-#endif
-
-       if (DEBUGLVL(2)) {
-               NDR_PRINT_DEBUG(security_descriptor, sd);
-       }
-       talloc_free(sd);
-       talloc_free(domain);
-       return true;
-}
-
-static const char *examples[] = {
-       "D:(A;;CC;;;BA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)",
-       "D:(A;;GA;;;SY)",
-       "D:(A;;GA;;;RS)",
-       "D:(A;;RP;;;WD)(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;ED)(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;ED)(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;ED)(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;BA)(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;BA)(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;BA)(A;;RPLCLORC;;;AU)(A;;RPWPCRLCLOCCRCWDWOSW;;;DA)(A;CI;RPWPCRLCLOCCRCWDWOSDSW;;;BA)(A;;RPWPCRLCLOCCDCRCWDWOSDDTSW;;;SY)(A;CI;RPWPCRLCLOCCDCRCWDWOSDDTSW;;;EA)(A;CI;LC;;;RU)(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;bf967aba-0de6-11d0-a285-00aa003049e2;RU)(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)(OA;CIIO;RP;4c164200-20c0-11d0-a768-00aa006e0529;bf967aba-0de6-11d0-a285-00aa003049e2;RU)(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)(OA;;RP;c7407360-20bf-11d0-a768-00aa006e0529;;RU)(OA;CIIO;RPLCLORC;;bf967a9c-0de6-11d0-a285-00aa003049e2;RU)(A;;RPRC;;;RU)(OA;CIIO;RPLCLORC;;bf967aba-0de6-11d0-a285-00aa003049e2;RU)(A;;LCRPLORC;;;ED)(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;4828CC14-1437-45bc-9B07-AD6F015E5F28;RU)(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;4828CC14-1437-45bc-9B07-AD6F015E5F28;RU)(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;4828CC14-1437-45bc-9B07-AD6F015E5F28;RU)(OA;CIIO;RP;4c164200-20c0-11d0-a768-00aa006e0529;4828CC14-1437-45bc-9B07-AD6F015E5F28;RU)(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;4828CC14-1437-45bc-9B07-AD6F015E5F28;RU)(OA;CIIO;RPLCLORC;;4828CC14-1437-45bc-9B07-AD6F015E5F28;RU)(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;RU)(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;AU)(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967aba-0de6-11d0-a285-00aa003049e2;ED)(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a9c-0de6-11d0-a285-00aa003049e2;ED)(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a86-0de6-11d0-a285-00aa003049e2;ED)(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;DD)(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;BA)(OA;;CR;e2a36dc9-ae17-47c3-b58b-be34c55ba633;;S-1-5-32-557)(OA;;CR;280f369c-67c7-438e-ae98-1d46f3c6f541;;AU)(OA;;CR;ccc2dc7d-a6ad-4a7a-8846-c04e3cc53501;;AU)(OA;;CR;05c74c5e-4deb-43b4-bd9f-86664c2a7fd5;;AU)S:(AU;SA;WDWOWP;;;WD)(AU;SA;CR;;;BA)(AU;SA;CR;;;DU)(OU;CISA;WP;f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)(OU;CISA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)",
-       "D:(A;;RPLCLORC;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)",
-       "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;AO)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPCRLCLORCSDDT;;;CO)(OA;;WP;4c164200-20c0-11d0-a768-00aa006e0529;;CO)(A;;RPLCLORC;;;AU)(OA;;CR;ab721a53-1e2f-11d0-9819-00aa0040529b;;WD)(A;;CCDC;;;PS)(OA;;CCDC;bf967aa8-0de6-11d0-a285-00aa003049e2;;PO)(OA;;RPWP;bf967a7f-0de6-11d0-a285-00aa003049e2;;CA)(OA;;SW;f3a64788-5306-11d1-a9c5-0000f80367c1;;PS)(OA;;RPWP;77B5B886-944A-11d1-AEBD-0000F80367C1;;PS)(OA;;SW;72e39547-7b18-11d1-adef-00c04fd8d5cd;;PS)(OA;;SW;72e39547-7b18-11d1-adef-00c04fd8d5cd;;CO)(OA;;SW;f3a64788-5306-11d1-a9c5-0000f80367c1;;CO)(OA;;WP;3e0abfd0-126a-11d0-a060-00aa006c33ed;bf967a86-0de6-11d0-a285-00aa003049e2;CO)(OA;;WP;5f202010-79a5-11d0-9020-00c04fc2d4cf;bf967a86-0de6-11d0-a285-00aa003049e2;CO)(OA;;WP;bf967950-0de6-11d0-a285-00aa003049e2;bf967a86-0de6-11d0-a285-00aa003049e2;CO)(OA;;WP;bf967953-0de6-11d0-a285-00aa003049e2;bf967a86-0de6-11d0-a285-00aa003049e2;CO)(OA;;RP;46a9b11d-60ae-405a-b7e8-ff8a58d456d2;;S-1-5-32-560)",
-       "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)",
-       "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;AO)(A;;RPLCLORC;;;PS)(OA;;CR;ab721a55-1e2f-11d0-9819-00aa0040529b;;AU)(OA;;RP;46a9b11d-60ae-405a-b7e8-ff8a58d456d2;;S-1-5-32-560)",
-       "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;CO)",
-       "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)S:(AU;SA;CRWP;;;WD)",
-       "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;AO)(A;;RPLCLORC;;;PS)(OA;;CR;ab721a53-1e2f-11d0-9819-00aa0040529b;;PS)(OA;;CR;ab721a54-1e2f-11d0-9819-00aa0040529b;;PS)(OA;;CR;ab721a56-1e2f-11d0-9819-00aa0040529b;;PS)(OA;;RPWP;77B5B886-944A-11d1-AEBD-0000F80367C1;;PS)(OA;;RPWP;E45795B2-9455-11d1-AEBD-0000F80367C1;;PS)(OA;;RPWP;E45795B3-9455-11d1-AEBD-0000F80367C1;;PS)(OA;;RP;037088f8-0ae1-11d2-b422-00a0c968f939;;RS)(OA;;RP;4c164200-20c0-11d0-a768-00aa006e0529;;RS)(OA;;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;;RS)(A;;RC;;;AU)(OA;;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;;AU)(OA;;RP;77B5B886-944A-11d1-AEBD-0000F80367C1;;AU)(OA;;RP;E45795B3-9455-11d1-AEBD-0000F80367C1;;AU)(OA;;RP;e48d0154-bcf8-11d1-8702-00c04fb96050;;AU)(OA;;CR;ab721a53-1e2f-11d0-9819-00aa0040529b;;WD)(OA;;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;;RS)(OA;;RPWP;bf967a7f-0de6-11d0-a285-00aa003049e2;;CA)(OA;;RP;46a9b11d-60ae-405a-b7e8-ff8a58d456d2;;S-1-5-32-560)(OA;;WPRP;6db69a1c-9422-11d1-aebd-0000f80367c1;;S-1-5-32-561)",
-       "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)",
-       "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)(A;;LCRPLORC;;;ED)",
-       "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(OA;;CCDC;bf967a86-0de6-11d0-a285-00aa003049e2;;AO)(OA;;CCDC;bf967aba-0de6-11d0-a285-00aa003049e2;;AO)(OA;;CCDC;bf967a9c-0de6-11d0-a285-00aa003049e2;;AO)(OA;;CCDC;bf967aa8-0de6-11d0-a285-00aa003049e2;;PO)(A;;RPLCLORC;;;AU)(A;;LCRPLORC;;;ED)(OA;;CCDC;4828CC14-1437-45bc-9B07-AD6F015E5F28;;AO)",
-       "D:(A;;RPWPCRCCDCLCLORCWOWDSW;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)",
-       "D:(A;CI;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)",
-       "D:S:",
-       "D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)"
-};
-
-/* test a set of example SDDL strings */
-struct torture_suite *torture_local_sddl(TALLOC_CTX *mem_ctx)
-{
-       struct torture_suite *suite = torture_suite_create(mem_ctx, "sddl");
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(examples); i++) {
-               torture_suite_add_simple_tcase_const(suite,
-                               talloc_asprintf(suite, "%d", i),
-                               test_sddl, examples[i]);
-       }
-
-       return suite;
-}

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 866e7632d19afc74f70568eb2433d38e74a4c558..3bfa0b3bca83a873b2a62499abf415aca017a2d6 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -470,6 +470,14 @@ plantestsuite_loadlist("samba.tests.dns_packet",
                         "samba.tests.dns_packet"
                        ])
 
+plantestsuite_loadlist("samba.tests.sddl",
+                       "none",
+                       [python,
+                        '-msamba.subunit.run',
+                        '$LOADLIST',
+                        "$LISTOPT"
+                        "samba.tests.sddl"
+                       ])
 
 for t in smbtorture4_testsuites("dns_internal."):
     plansmbtorture4testsuite(t, "ad_dc_default:local", '//$SERVER/whavever')

diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
index d19b55e9502f41d7ec5df5e82fa56296c996fb37..eb4ba972c25d273115e290c2fc1d3e873ead77da 100644 (file)
--- a/source4/torture/local/local.c
+++ b/source4/torture/local/local.c
@@ -55,7 +55,6 @@
        torture_local_socket, 
        torture_pac, 
        torture_local_resolve,
-       torture_local_sddl,
        torture_local_ndr, 
        torture_local_tdr, 
        torture_local_share,

diff --git a/source4/torture/local/wscript_build b/source4/torture/local/wscript_build
index f0ab0357986dbc386b034fb8e597f859e38a68b3..8c4d78d82a00ba94ff40476f9dea1e6e1a0046fb 100644 (file)
--- a/source4/torture/local/wscript_build
+++ b/source4/torture/local/wscript_build
@@ -13,7 +13,7 @@ TORTURE_LOCAL_SOURCE = '''../../../lib/util/charset/tests/iconv.c
        ../../../lib/util/tests/file.c ../../../lib/util/tests/genrand.c
        ../../../lib/compression/testsuite.c ../../../lib/util/charset/tests/charset.c
         ../../../lib/util/charset/tests/convert_string.c
-       ../../libcli/security/tests/sddl.c ../../../lib/tdr/testsuite.c
+       ../../../lib/tdr/testsuite.c
        ../../../lib/tevent/testsuite.c ../../param/tests/share.c
         ../../../lib/tevent/test_req.c
        ../../param/tests/loadparm.c local.c