diff options
| author | Joseph Sutton <josephsutton@catalyst.net.nz> | 2021-03-30 16:00:04 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2021-04-07 09:18:30 +0000 |
| commit | 6b57583830007f745360a5dcab9760a66fd3ad0e (patch) | |
| tree | 98081c975cbf2ce7bf698648e5c3a5fc128c8596 /source4/torture | |
| parent | 3e531bb885c90c6d8f10570eda1be20ac44a7c9b (diff) | |
| download | samba-6b57583830007f745360a5dcab9760a66fd3ad0e.tar.gz | |
cracknames: Add support for SID string format
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10319
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/drs/python/cracknames.py | 3 | ||||
| -rw-r--r-- | source4/torture/rpc/drsuapi_cracknames.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source4/torture/drs/python/cracknames.py b/source4/torture/drs/python/cracknames.py index e4884ea0f63..f2446050d8c 100644 --- a/source4/torture/drs/python/cracknames.py +++ b/source4/torture/drs/python/cracknames.py @@ -60,8 +60,7 @@ class DrsCracknamesTestCase(drs_base.DrsBaseTestCase): drsuapi.DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL, drsuapi.DRSUAPI_DS_NAME_FORMAT_CANONICAL_EX, drsuapi.DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL, - # We currently don't support this - # drsuapi.DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY, + drsuapi.DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY, # This format is not supported by Windows (or us) # drsuapi.DRSUAPI_DS_NAME_FORMAT_DNS_DOMAIN, } diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c index f23c33fed7f..102f9664b3a 100644 --- a/source4/torture/rpc/drsuapi_cracknames.c +++ b/source4/torture/rpc/drsuapi_cracknames.c @@ -129,7 +129,6 @@ static bool test_DsCrackNamesMatrix(struct torture_context *tctx, break; case DRSUAPI_DS_NAME_FORMAT_UNKNOWN: /* should fail as we ask server to convert to Unknown format */ case DRSUAPI_DS_NAME_FORMAT_DNS_DOMAIN: - case DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY: if (r.out.ctr->ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR) { err_msg = talloc_asprintf(mem_ctx, "Unexpected error (%d): This name lookup should fail", @@ -156,7 +155,6 @@ static bool test_DsCrackNamesMatrix(struct torture_context *tctx, n_from[i] = service_principal_name; break; case DRSUAPI_DS_NAME_FORMAT_UNKNOWN: - case DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY: case DRSUAPI_DS_NAME_FORMAT_DNS_DOMAIN: n_from[i] = NULL; break; |