sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

s4:torture: return ETYPE_INFO2 on PREAUTH_FAILED

Browse Source 
This is an alternative to 978bc8681e
which got overriten by the upgrade merge.
One difference however, is that we don't return ENC_TIMESTAMP like
in PREAUTH_REQUIRED but only ETYPE_INFO2 same as Windows.

NOTE: THIS COMMIT WON'T COMPILE/WORK ON ITS OWN!

Signed-off-by: Isaac Boukris <iboukris@gmail.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Isaac Boukris 2018-11-09 00:20:06 +02:00 committed by Joseph Sutton
parent 0b9c8b9e12
commit 7679d596c5
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source4/torture/krb5/kdc-heimdal.c
View File

@ -161,7 +161,8 @@ static bool torture_check_krb5_error(struct torture_krb5_context *test_context,
METHOD_DATA m;
size_t len;
int i;
bool found = false;
bool found_enc_ts = false;
bool found_etype_info2 = false;
torture_assert(test_context->tctx,
error.e_data != NULL,
"No e-data returned");
@ -174,27 +175,24 @@ static bool torture_check_krb5_error(struct torture_krb5_context *test_context,
rc, 0,
"Got invalid method data");
/*
* NOTE:
*
* Windows (eg Server 1709) only returns a
* KRB5_PADATA_ETYPE_INFO2 in this situation.
* This test should be fixed but care needs to
* be taken not to reintroduce
* https://bugzilla.samba.org/show_bug.cgi?id=11539
*/
torture_assert(test_context->tctx,
m.len > 0,
"No PA_DATA given");
for (i = 0; i < m.len; i++) {
if (m.val[i].padata_type == KRB5_PADATA_ENC_TIMESTAMP) {
found = true;
break;
found_enc_ts = true;
}
else if (m.val[i].padata_type == KRB5_PADATA_ETYPE_INFO2) {
found_etype_info2 = true;
}
}
torture_assert(test_context->tctx,
found,
"Encrypted timestamp not found");
found_etype_info2,
"PADATA_ETYPE_INFO2 not found");
if (expected_error != KRB5KDC_ERR_PREAUTH_FAILED)
torture_assert(test_context->tctx,
found_enc_ts,
"Encrypted timestamp not found");
}
free_KRB_ERROR(&error);