torture: Add a dummy test for MIT Kerberos case

This is a preperatory test to add tests for the MIT KDC.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

1 files changed, 2248 insertions, 0 deletions

diff --git a/source4/torture/krb5/kdc-canon-heimdal.c b/source4/torture/krb5/kdc-canon-heimdal.c
new file mode 100644
index 00000000000..fece17f3249
--- /dev/null
+++ b/source4/torture/krb5/kdc-canon-heimdal.c
@@ -0,0 +1,2248 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Validate the krb5 pac generation routines
+
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005-2015
+
+   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 "system/kerberos.h"
+#include "torture/smbtorture.h"
+#include "torture/krb5/proto.h"
+#include "auth/credentials/credentials.h"
+#include "lib/cmdline/popt_common.h"
+#include "source4/auth/kerberos/kerberos.h"
+#include "source4/auth/kerberos/kerberos_util.h"
+#include "lib/util/util_net.h"
+#include "auth/auth.h"
+#include "auth/auth_sam_reply.h"
+#include "auth/gensec/gensec.h"
+#include "param/param.h"
+
+#define TEST_CANONICALIZE     0x0000001
+#define TEST_ENTERPRISE       0x0000002
+#define TEST_UPPER_REALM      0x0000004
+#define TEST_UPPER_USERNAME   0x0000008
+#define TEST_NETBIOS_REALM    0x0000010
+#define TEST_WIN2K            0x0000020
+#define TEST_UPN              0x0000040
+#define TEST_S4U2SELF         0x0000080
+#define TEST_REMOVEDOLLAR     0x0000100
+#define TEST_ALL              0x00001FF
+
+struct test_data {
+	const char *test_name;
+	const char *realm;
+	const char *real_realm;
+	const char *real_domain;
+	const char *username;
+	const char *real_username;
+	bool canonicalize;
+	bool enterprise;
+	bool upper_realm;
+	bool upper_username;
+	bool netbios_realm;
+	bool win2k;
+	bool upn;
+	bool other_upn_suffix;
+	bool s4u2self;
+	bool removedollar;
+	const char *krb5_service;
+	const char *krb5_hostname;
+};
+
+enum test_stage {
+	TEST_AS_REQ = 0,
+	TEST_TGS_REQ_KRBTGT_CANON = 1,
+	TEST_TGS_REQ_CANON = 2,
+	TEST_SELF_TRUST_TGS_REQ = 3,
+	TEST_TGS_REQ = 4,
+	TEST_TGS_REQ_KRBTGT = 5,
+	TEST_TGS_REQ_HOST = 6,
+	TEST_TGS_REQ_HOST_SRV_INST = 7,
+	TEST_TGS_REQ_HOST_SRV_HST = 8,
+	TEST_AS_REQ_SELF = 9,
+	TEST_DONE = 10
+};
+
+struct torture_krb5_context {
+	struct smb_krb5_context *smb_krb5_context;
+	struct torture_context *tctx;
+	struct addrinfo *server;
+	struct test_data *test_data;
+	int packet_count;
+	enum test_stage test_stage;
+	AS_REQ as_req;
+	AS_REP as_rep;
+	TGS_REQ tgs_req;
+	TGS_REP tgs_rep;
+};
+
+struct pac_data {
+	const char *principal_name;
+};
+
+/*
+ * A helper function which avoids touching the local databases to
+ * generate the session info, as we just want to verify the principal
+ * name that we found in the ticket not the full local token
+ */
+static NTSTATUS test_generate_session_info_pac(struct auth4_context *auth_ctx,
+					       TALLOC_CTX *mem_ctx,
+					       struct smb_krb5_context *smb_krb5_context,
+					       DATA_BLOB *pac_blob,
+					       const char *principal_name,
+					       const struct tsocket_address *remote_address,
+					       uint32_t session_info_flags,
+					       struct auth_session_info **session_info)
+{
+	NTSTATUS nt_status;
+	struct auth_user_info_dc *user_info_dc;
+	TALLOC_CTX *tmp_ctx;
+	struct pac_data *pac_data;
+
+	tmp_ctx = talloc_named(mem_ctx, 0, "gensec_gssapi_session_info context");
+	NT_STATUS_HAVE_NO_MEMORY(tmp_ctx);
+
+	auth_ctx->private_data = pac_data = talloc_zero(auth_ctx, struct pac_data);
+
+	pac_data->principal_name = talloc_strdup(pac_data, principal_name);
+	if (!pac_data->principal_name) {
+		talloc_free(tmp_ctx);
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	nt_status = kerberos_pac_blob_to_user_info_dc(tmp_ctx,
+						      *pac_blob,
+						      smb_krb5_context->krb5_context,
+						      &user_info_dc, NULL, NULL);
+	if (!NT_STATUS_IS_OK(nt_status)) {
+		talloc_free(tmp_ctx);
+		return nt_status;
+	}
+
+	if (user_info_dc->info->authenticated) {
+		session_info_flags |= AUTH_SESSION_INFO_AUTHENTICATED;
+	}
+
+	session_info_flags |= AUTH_SESSION_INFO_SIMPLE_PRIVILEGES;
+	nt_status = auth_generate_session_info(mem_ctx,
+					       NULL,
+					       NULL,
+					       user_info_dc, session_info_flags,
+					       session_info);
+	if (!NT_STATUS_IS_OK(nt_status)) {
+		talloc_free(tmp_ctx);
+		return nt_status;
+	}
+
+	talloc_free(tmp_ctx);
+	return NT_STATUS_OK;
+}
+
+/* Check to see if we can pass the PAC across to the NETLOGON server for validation */
+
+/* Also happens to be a really good one-step verfication of our Kerberos stack */
+
+static bool test_accept_ticket(struct torture_context *tctx,
+			       struct cli_credentials *credentials,
+			       const char *principal,
+			       DATA_BLOB client_to_server)
+{
+	NTSTATUS status;
+	struct gensec_security *gensec_server_context;
+	DATA_BLOB server_to_client;
+	struct auth4_context *auth_context;
+	struct auth_session_info *session_info;
+	struct pac_data *pac_data;
+	TALLOC_CTX *tmp_ctx = talloc_new(tctx);
+
+	torture_assert(tctx, tmp_ctx != NULL, "talloc_new() failed");
+
+	auth_context = talloc_zero(tmp_ctx, struct auth4_context);
+	torture_assert(tctx, auth_context != NULL, "talloc_new() failed");
+
+	auth_context->generate_session_info_pac = test_generate_session_info_pac;
+
+	status = gensec_server_start(tctx,
+				     lpcfg_gensec_settings(tctx, tctx->lp_ctx),
+				     auth_context, &gensec_server_context);
+	torture_assert_ntstatus_ok(tctx, status, "gensec_server_start (server) failed");
+
+	status = gensec_set_credentials(gensec_server_context, credentials);
+	torture_assert_ntstatus_ok(tctx, status, "gensec_set_credentials (server) failed");
+
+	status = gensec_start_mech_by_name(gensec_server_context, "krb5");
+	torture_assert_ntstatus_ok(tctx, status, "gensec_start_mech_by_name (server) failed");
+
+	server_to_client = data_blob(NULL, 0);
+
+	/* Do a client-server update dance */
+	status = gensec_update(gensec_server_context, tmp_ctx, client_to_server, &server_to_client);
+	torture_assert_ntstatus_ok(tctx, status, "gensec_update (server) failed");
+
+	/* Extract the PAC using Samba's code */
+
+	status = gensec_session_info(gensec_server_context, gensec_server_context, &session_info);
+	torture_assert_ntstatus_ok(tctx, status, "gensec_session_info failed");
+
+	pac_data = talloc_get_type(auth_context->private_data, struct pac_data);
+
+	torture_assert(tctx, pac_data != NULL, "gensec_update failed to fill in pac_data in auth_context");
+	torture_assert(tctx, pac_data->principal_name != NULL, "principal_name not present");
+	torture_assert_str_equal(tctx, pac_data->principal_name, principal, "wrong principal name");
+	return true;
+}
+
+/*
+ * TEST_AS_REQ and TEST_AS_REQ_SELF - SEND
+ *
+ * Confirm that the outgoing packet meets certain expectations.  This
+ * should be extended to further assert the correct and expected
+ * behaviour of the krb5 libs, so we know what we are sending to the
+ * server.
+ *
+ * Additionally, this CHANGES the request to remove the canonicalize
+ * flag automatically added by the krb5 libs when an enterprise
+ * principal is used, so we can test what the server does in this
+ * combination.
+ *
+ */
+
+static bool torture_krb5_pre_send_as_req_test(struct torture_krb5_context *test_context,
+					      const krb5_data *send_buf,
+					      krb5_data *modified_send_buf)
+{
+	AS_REQ mod_as_req;
+	krb5_error_code k5ret;
+	size_t used;
+	torture_assert_int_equal(test_context->tctx, decode_AS_REQ(send_buf->data, send_buf->length,
+					       &test_context->as_req, &used),
+				 0, "decode_AS_REQ for TEST_AS_REQ failed");
+	mod_as_req = test_context->as_req;
+	torture_assert_int_equal(test_context->tctx, used, send_buf->length, "length mismatch");
+	torture_assert_int_equal(test_context->tctx, test_context->as_req.pvno,
+				 5, "Got wrong as_req->pvno");
+	if (test_context->test_data->canonicalize || test_context->test_data->enterprise) {
+		torture_assert(test_context->tctx,
+			       test_context->as_req.req_body.kdc_options.canonicalize,
+			       "krb5 libs did not set canonicalize!");
+	} else {
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->as_req.req_body.kdc_options.canonicalize,
+					 false,
+					 "krb5 libs unexpectedly set canonicalize!");
+	}
+
+	if (test_context->test_data->enterprise) {
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->as_req.req_body.cname->name_type,
+					 KRB5_NT_ENTERPRISE_PRINCIPAL,
+					 "krb5 libs did not pass principal as enterprise!");
+	} else {
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->as_req.req_body.cname->name_type,
+					 KRB5_NT_PRINCIPAL,
+					 "krb5 libs unexpectedly set principal as enterprise!");
+	}
+
+	/* Force off canonicalize that was forced on by the krb5 libs */
+	if (test_context->test_data->canonicalize == false && test_context->test_data->enterprise) {
+		mod_as_req.req_body.kdc_options.canonicalize = false;
+	}
+
+	if (test_context->test_stage == TEST_AS_REQ_SELF) {
+		/*
+		 * Force the server name to match the client name,
+		 * including the name type.  This isn't possible with
+		 * the krb5 client libs alone
+		 */
+		mod_as_req.req_body.sname = test_context->as_req.req_body.cname;
+	}
+
+	ASN1_MALLOC_ENCODE(AS_REQ, modified_send_buf->data, modified_send_buf->length,
+			   &mod_as_req, &used, k5ret);
+	torture_assert_int_equal(test_context->tctx,
+				 k5ret, 0,
+				 "encode_AS_REQ failed");
+
+	if (test_context->test_stage != TEST_AS_REQ_SELF) {
+		torture_assert_int_equal(test_context->tctx, used, send_buf->length,
+					 "re-encode length mismatch");
+	}
+	return true;
+}
+
+/*
+ * TEST_AS_REQ - RECV
+ *
+ * Confirm that the reply packet from the KDC meets certain
+ * expectations as part of TEST_AS_REQ.  This uses a packet count to
+ * work out what packet we are up to in the multiple exchanged
+ * triggerd by krb5_get_init_creds_password().
+ *
+ */
+
+static bool torture_krb5_post_recv_as_req_test(struct torture_krb5_context *test_context,
+					       const krb5_data *recv_buf)
+{
+	KRB_ERROR error;
+	size_t used;
+	if (test_context->packet_count == 0) {
+		krb5_error_code k5ret;
+		/*
+		 * The client libs obtain the salt by attempting to
+		 * authenticate without pre-authentication and getting
+		 * the correct salt with the
+		 * KRB5KDC_ERR_PREAUTH_REQUIRED error.  If we are in
+		 * the test (netbios_realm && upn) that deliberatly
+		 * has an incorrect principal, we check we get the
+		 * correct error.
+		 */
+		k5ret = decode_KRB_ERROR(recv_buf->data, recv_buf->length,
+					 &error, &used);
+		if (k5ret != 0) {
+			AS_REP as_rep;
+			k5ret = decode_AS_REP(recv_buf->data, recv_buf->length,
+				      &as_rep, &used);
+			if (k5ret == 0) {
+				if (test_context->test_data->netbios_realm && test_context->test_data->upn) {
+					torture_assert(test_context->tctx, false,
+						       "expected to get a KRB_ERROR packet with "
+						       "KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN, got valid AS-REP");
+				} else {
+					torture_assert(test_context->tctx, false,
+						       "expected to get a KRB_ERROR packet with "
+						       "KRB5KDC_ERR_PREAUTH_REQUIRED, got valid AS-REP");
+				}
+			} else {
+				if (test_context->test_data->netbios_realm && test_context->test_data->upn) {
+					torture_assert(test_context->tctx, false,
+						       "unable to decode as KRB-ERROR or AS-REP, "
+						       "expected to get a KRB_ERROR packet with KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN");
+				} else {
+					torture_assert(test_context->tctx, false,
+						       "unable to decode as KRB-ERROR or AS-REP, "
+						       "expected to get a KRB_ERROR packet with KRB5KDC_ERR_PREAUTH_REQUIRED");
+				}
+			}
+		}
+		torture_assert_int_equal(test_context->tctx, used, recv_buf->length,
+					 "length mismatch");
+		torture_assert_int_equal(test_context->tctx, error.pvno, 5,
+					 "Got wrong error.pvno");
+		if (test_context->test_data->netbios_realm && test_context->test_data->upn) {
+			torture_assert_int_equal(test_context->tctx,
+						 error.error_code,
+						 KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN - KRB5KDC_ERR_NONE,
+						 "Got wrong error.error_code");
+		} else {
+			torture_assert_int_equal(test_context->tctx,
+						 error.error_code,
+						 KRB5KDC_ERR_PREAUTH_REQUIRED - KRB5KDC_ERR_NONE,
+						 "Got wrong error.error_code");
+		}
+
+		free_KRB_ERROR(&error);
+	} else if ((decode_KRB_ERROR(recv_buf->data, recv_buf->length, &error, &used) == 0)
+		   && (test_context->packet_count == 1)) {
+		/*
+		 * The Windows 2012R2 KDC will always respond with
+		 * KRB5KRB_ERR_RESPONSE_TOO_BIG over UDP as the ticket
+		 * won't fit, because of the PAC.  (It appears to do
+		 * this always, even if it will).  This triggers the
+		 * client to try again over TCP.
+		 */
+		torture_assert_int_equal(test_context->tctx,
+					 used, recv_buf->length,
+					 "length mismatch");
+		torture_assert_int_equal(test_context->tctx,
+					 error.pvno, 5,
+					 "Got wrong error.pvno");
+		torture_assert_int_equal(test_context->tctx,
+					 error.error_code,
+					 KRB5KRB_ERR_RESPONSE_TOO_BIG - KRB5KDC_ERR_NONE,
+					 "Got wrong error.error_code");
+		free_KRB_ERROR(&error);
+	} else {
+		/*
+		 * Finally the successful packet.
+		 */
+		torture_assert_int_equal(test_context->tctx,
+					 decode_AS_REP(recv_buf->data, recv_buf->length,
+						       &test_context->as_rep, &used), 0,
+					 "decode_AS_REP failed");
+		torture_assert_int_equal(test_context->tctx, used, recv_buf->length,
+					 "length mismatch");
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->as_rep.pvno, 5,
+					 "Got wrong as_rep->pvno");
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->as_rep.ticket.tkt_vno, 5,
+					 "Got wrong as_rep->ticket.tkt_vno");
+		torture_assert(test_context->tctx,
+			       test_context->as_rep.ticket.enc_part.kvno,
+			       "Did not get a KVNO in test_context->as_rep.ticket.enc_part.kvno");
+
+		/*
+		 * We can confirm that the correct proxy behaviour is
+		 * in use on the KDC by checking the KVNO of the
+		 * krbtgt account returned in the reply.
+		 *
+		 * A packet passed to the full RW DC will not have a
+		 * KVNO in the upper bits, while a packet processed
+		 * locally on the RODC will have these bits filled in
+		 * the msDS-SecondaryKrbTgtNumber
+		 */
+		if (torture_setting_bool(test_context->tctx, "expect_cached_at_rodc", false)) {
+			torture_assert_int_not_equal(test_context->tctx,
+						     *test_context->as_rep.ticket.enc_part.kvno & 0xFFFF0000,
+						     0, "Did not get a RODC number in the KVNO");
+		} else {
+			torture_assert_int_equal(test_context->tctx,
+						 *test_context->as_rep.ticket.enc_part.kvno & 0xFFFF0000,
+						 0, "Unexpecedly got a RODC number in the KVNO");
+		}
+		free_AS_REP(&test_context->as_rep);
+	}
+	torture_assert(test_context->tctx, test_context->packet_count < 3, "too many packets");
+	free_AS_REQ(&test_context->as_req);
+	return true;
+}
+
+/*
+ * TEST_TGS_REQ_KRBTGT_CANON
+ *
+ *
+ * Confirm that the outgoing TGS-REQ packet from krb5_get_creds()
+ * for the krbtgt/realm principal meets certain expectations, like
+ * that the canonicalize bit is not set
+ *
+ */
+
+static bool torture_krb5_pre_send_tgs_req_krbtgt_canon_test(struct torture_krb5_context *test_context, const krb5_data *send_buf, krb5_data *modified_send_buf)
+{
+	size_t used;
+	torture_assert_int_equal(test_context->tctx,
+				 decode_TGS_REQ(send_buf->data, send_buf->length,
+						&test_context->tgs_req, &used),
+				 0, "decode_TGS_REQ for TEST_TGS_REQ test failed");
+	torture_assert_int_equal(test_context->tctx,
+				 used, send_buf->length,
+				 "length mismatch");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_req.pvno, 5,
+				 "Got wrong as_req->pvno");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.kdc_options.canonicalize,
+				 true,
+				 "krb5 libs unexpectedly did not set canonicalize!");
+
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.sname->name_type,
+				 KRB5_NT_PRINCIPAL,
+				 "Mismatch in name_type between request and expected request");
+
+	torture_assert_str_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.realm,
+				 test_context->test_data->real_realm,
+				 "Mismatch in realm between request and expected request");
+
+	*modified_send_buf = *send_buf;
+	return true;
+}
+
+/*
+ * TEST_TGS_REQ_KRBTGT_CANON
+ *
+ * Confirm that the reply TGS-REP packet for krb5_get_creds()
+ * where the client is behaving as if this is a cross-realm trust due
+ * to case or netbios vs dns name differences meets certain
+ * expectations, while canonicalize is set
+ *
+ */
+
+static bool torture_krb5_post_recv_tgs_req_krbtgt_canon_test(struct torture_krb5_context *test_context, const krb5_data *recv_buf)
+{
+	size_t used;
+	torture_assert_int_equal(test_context->tctx,
+				 decode_TGS_REP(recv_buf->data, recv_buf->length,
+						&test_context->tgs_rep, &used),
+				 0,
+				 "decode_TGS_REP failed");
+	torture_assert_int_equal(test_context->tctx, used, recv_buf->length, "length mismatch");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_rep.pvno, 5,
+				 "Got wrong as_rep->pvno");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.tkt_vno, 5,
+				 "Got wrong as_rep->ticket.tkt_vno");
+	torture_assert(test_context->tctx,
+		       test_context->tgs_rep.ticket.enc_part.kvno,
+		       "Did not get a KVNO in test_context->as_rep.ticket.enc_part.kvno");
+	torture_assert_str_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.realm,
+				 test_context->tgs_rep.ticket.realm,
+				 "Mismatch in realm between request and ticket response");
+	torture_assert_str_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.realm,
+				 test_context->test_data->real_realm,
+				 "Mismatch in realm between ticket response and expected ticket response");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.sname.name_type,
+				 KRB5_NT_SRV_INST,
+				 "Mismatch in name_type between ticket response and expected value of KRB5_NT_SRV_INST");
+
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.sname.name_string.len,
+				 2,
+				 "Mismatch in name_type between ticket response and expected value, expected krbtgt/REALM@REALM");
+
+	torture_assert_str_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.sname.name_string.val[0], "krbtgt",
+				 "Mismatch in name between reponse and expected response, expected krbtgt");
+	torture_assert_str_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.sname.name_string.val[1], test_context->test_data->real_realm,
+				 "Mismatch in realm part of krbtgt/ in expected response, expected krbtgt/REALM@REALM");
+
+	/*
+	 * We can confirm that the correct proxy behaviour is
+	 * in use on the KDC by checking the KVNO of the
+	 * krbtgt account returned in the reply.
+	 *
+	 * A packet passed to the full RW DC will not have a
+	 * KVNO in the upper bits, while a packet processed
+	 * locally on the RODC will have these bits filled in
+	 * the msDS-SecondaryKrbTgtNumber
+	 */
+	if (torture_setting_bool(test_context->tctx, "expect_cached_at_rodc", false)) {
+		torture_assert_int_not_equal(test_context->tctx,
+					     *test_context->tgs_rep.ticket.enc_part.kvno & 0xFFFF0000,
+					     0, "Did not get a RODC number in the KVNO");
+	} else {
+		torture_assert_int_equal(test_context->tctx,
+					 *test_context->tgs_rep.ticket.enc_part.kvno & 0xFFFF0000,
+					 0, "Unexpecedly got a RODC number in the KVNO");
+	}
+	free_TGS_REP(&test_context->tgs_rep);
+	torture_assert(test_context->tctx,
+		       test_context->packet_count < 2,
+		       "too many packets");
+	free_TGS_REQ(&test_context->tgs_req);
+	return true;
+}
+
+/*
+ * TEST_TGS_REQ_CANON
+ *
+ * Confirm that the outgoing TGS-REQ packet from krb5_get_creds
+ * certain expectations, like that the canonicalize bit is set (this
+ * test is to force that handling) and that if an enterprise name was
+ * requested, that it was sent.
+ *
+ */
+
+static bool torture_krb5_pre_send_tgs_req_canon_test(struct torture_krb5_context *test_context,
+						     const krb5_data *send_buf,
+						     krb5_data *modified_send_buf)
+{
+	size_t used;
+	torture_assert_int_equal(test_context->tctx,
+				 decode_TGS_REQ(send_buf->data, send_buf->length,
+						&test_context->tgs_req, &used),
+				 0, "decode_TGS_REQ for TEST_TGS_REQ_CANON test failed");
+	torture_assert_int_equal(test_context->tctx, used, send_buf->length, "length mismatch");
+	torture_assert_int_equal(test_context->tctx, test_context->tgs_req.pvno, 5, "Got wrong as_req->pvno");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.kdc_options.canonicalize,
+				 true, "krb5 libs unexpectedly did not set canonicalize!");
+
+	if (test_context->test_data->enterprise) {
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.sname->name_type, KRB5_NT_ENTERPRISE_PRINCIPAL,
+				 "Mismatch in name type between request and expected request, expected  KRB5_NT_ENTERPRISE_PRINCIPAL");
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.realm, test_context->test_data->real_realm,
+				 "Mismatch in realm between request and expected request");
+
+	} else if (test_context->test_data->canonicalize) {
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.sname->name_type, KRB5_NT_PRINCIPAL,
+					 "Mismatch in name type between request and expected request, expected  KRB5_NT_PRINCIPAL");
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.realm, test_context->test_data->real_realm,
+				 "Mismatch in realm between request and expected request");
+
+	} else {
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.sname->name_type, KRB5_NT_PRINCIPAL,
+					 "Mismatch in name type between request and expected request, expected  KRB5_NT_PRINCIPAL");
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.realm, test_context->test_data->realm,
+				 "Mismatch in realm between request and expected request");
+
+	}
+
+	*modified_send_buf = *send_buf;
+
+	return true;
+}
+
+/*
+ * TEST_TGS_REQ_CANON - RECV
+ *
+ * Confirm that the reply TGS-REP or error packet from the KDC meets
+ * certain expectations as part of TEST_TGS_REQ_CANON.
+ *
+ * This is triggered by krb5_get_creds()
+ *
+ */
+
+static bool torture_krb5_post_recv_tgs_req_canon_test(struct torture_krb5_context *test_context, const krb5_data *recv_buf)
+{
+	KRB_ERROR error;
+	size_t used;
+
+	/*
+	 * If this account did not have a servicePrincipalName, then
+	 * we expect a errro packet, not a TGS-REQ
+	 */
+	if (decode_KRB_ERROR(recv_buf->data, recv_buf->length, &error, &used) == 0) {
+		torture_assert_int_equal(test_context->tctx, used, recv_buf->length, "length mismatch");
+		torture_assert_int_equal(test_context->tctx,
+					 error.pvno, 5,
+					 "Got wrong error.pvno");
+		torture_assert_int_equal(test_context->tctx,
+					 error.error_code,
+					 KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN - KRB5KDC_ERR_NONE,
+					 "Got wrong error.error_code");
+	} else {
+		torture_assert_int_equal(test_context->tctx,
+					 decode_TGS_REP(recv_buf->data, recv_buf->length,
+							&test_context->tgs_rep,
+							&used),
+					 0,
+					 "decode_TGS_REP failed");
+		torture_assert_int_equal(test_context->tctx,
+					 used, recv_buf->length,
+					 "length mismatch");
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_rep.pvno, 5,
+					 "Got wrong as_rep->pvno");
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_rep.ticket.tkt_vno, 5,
+					 "Got wrong as_rep->ticket.tkt_vno");
+		torture_assert(test_context->tctx,
+			       test_context->tgs_rep.ticket.enc_part.kvno,
+			       "Did not get a KVNO in test_context->as_rep.ticket.enc_part.kvno");
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_rep.ticket.realm,
+					 test_context->test_data->real_realm,
+					 "Mismatch in realm between ticket response and expected upper case REALM");
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_rep.ticket.sname.name_type,
+					 test_context->tgs_req.req_body.sname->name_type,
+					 "Mismatch in name_type between request and ticket response");
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_rep.ticket.sname.name_string.len,
+					 test_context->tgs_req.req_body.sname->name_string.len,
+					 "Mismatch in name_string.len between request and ticket response");
+		torture_assert(test_context->tctx,
+			       test_context->tgs_rep.ticket.sname.name_string.len >= 1,
+			       "name_string.len should be >=1 in ticket response");
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_rep.ticket.sname.name_string.val[0],
+					 test_context->tgs_req.req_body.sname->name_string.val[0],
+					 "Mismatch in name between request and expected request");
+		torture_assert_int_equal(test_context->tctx,
+					 *test_context->tgs_rep.ticket.enc_part.kvno & 0xFFFF0000,
+					 0, "Unexpecedly got a RODC number in the KVNO, should just be principal KVNO");
+		free_TGS_REP(&test_context->tgs_rep);
+	}
+	torture_assert(test_context->tctx, test_context->packet_count == 0, "too many packets");
+	free_TGS_REQ(&test_context->tgs_req);
+
+	return true;
+}
+
+/*
+ * TEST_SELF_TRUST_TGS_REQ
+ *
+ * Confirm that the outgoing TGS-REQ packet from krb5_mk_req_exact()
+ * certain expectations, like that the canonicalize bit is set (this
+ * test is to force that handling).
+ *
+ * This test is for the case where the name we ask for, while a valid
+ * alternate name for our own realm is used.  The client acts as if
+ * this is cross-realm trust.
+ *
+ */
+
+static bool torture_krb5_pre_send_self_trust_tgs_req_test(struct torture_krb5_context *test_context,
+							  const krb5_data *send_buf,
+							  krb5_data *modified_send_buf)
+{
+	size_t used;
+	torture_assert_int_equal(test_context->tctx,
+				 decode_TGS_REQ(send_buf->data, send_buf->length,
+						&test_context->tgs_req, &used),
+				 0, "decode_TGS_REQ for TEST_SELF_TRUST_TGS_REQ test failed");
+	torture_assert_int_equal(test_context->tctx, used, send_buf->length, "length mismatch");
+	torture_assert_int_equal(test_context->tctx, test_context->tgs_req.pvno, 5, "Got wrong as_req->pvno");
+	torture_assert_int_equal(test_context->tctx, test_context->tgs_req.req_body.kdc_options.canonicalize, false, "krb5 libs unexpectedly set canonicalize!");
+
+	if (test_context->test_data->canonicalize) {
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.realm,
+					 test_context->test_data->real_realm,
+					 "Mismatch in realm between request and expected request");
+	} else {
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.realm,
+					 test_context->test_data->realm,
+					 "Mismatch in realm between request and expected request");
+	}
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.sname->name_type, KRB5_NT_PRINCIPAL,
+				 "Mismatch in name type between request and expected request, expected  KRB5_NT_PRINCIPAL");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.sname->name_string.len, 2,
+				 "Mismatch in name between request and expected request, expected krbtgt/realm");
+	torture_assert_str_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.sname->name_string.val[0], "krbtgt",
+				 "Mismatch in name between request and expected request, expected krbtgt");
+	torture_assert_str_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.sname->name_string.val[1], test_context->test_data->realm,
+				 "Mismatch in realm part of cross-realm request principal between request and expected request");
+	*modified_send_buf = *send_buf;
+
+	return true;
+}
+
+/*
+ * TEST_SELF_TRUST_TGS_REQ and TEST_TGS_REQ_KRBTGT - RECV
+ *
+ * Confirm that the reply TGS-REP packet for krb5_mk_req_exact(),
+ * where the client is behaving as if this is a cross-realm trust due
+ * to case or netbios vs dns name differences meets certain
+ * expectations.
+ *
+ */
+
+static bool torture_krb5_post_recv_self_trust_tgs_req_test(struct torture_krb5_context *test_context, const krb5_data *recv_buf)
+{
+	size_t used;
+	torture_assert_int_equal(test_context->tctx,
+				 decode_TGS_REP(recv_buf->data, recv_buf->length,
+						&test_context->tgs_rep, &used),
+				 0,
+				 "decode_TGS_REP failed");
+	torture_assert_int_equal(test_context->tctx, used, recv_buf->length, "length mismatch");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_rep.pvno, 5,
+				 "Got wrong as_rep->pvno");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.tkt_vno, 5,
+				 "Got wrong as_rep->ticket.tkt_vno");
+	torture_assert(test_context->tctx,
+		       test_context->tgs_rep.ticket.enc_part.kvno,
+		       "Did not get a KVNO in test_context->as_rep.ticket.enc_part.kvno");
+	torture_assert_str_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.realm,
+				 test_context->tgs_rep.ticket.realm,
+				 "Mismatch in realm between request and ticket response");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.sname.name_type,
+				 test_context->tgs_req.req_body.sname->name_type,
+				 "Mismatch in name_type between request and ticket response");
+
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.sname.name_string.len, 2,
+				 "Mismatch in name between request and expected request, expected krbtgt/realm");
+	torture_assert_str_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.sname.name_string.val[0], "krbtgt",
+				 "Mismatch in name between request and expected request, expected krbtgt");
+	torture_assert_str_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.sname.name_string.val[1], test_context->test_data->realm,
+				 "Mismatch in realm part of cross-realm request principal between response and expected request");
+	/*
+	 * We can confirm that the correct proxy behaviour is
+	 * in use on the KDC by checking the KVNO of the
+	 * krbtgt account returned in the reply.
+	 *
+	 * A packet passed to the full RW DC will not have a
+	 * KVNO in the upper bits, while a packet processed
+	 * locally on the RODC will have these bits filled in
+	 * the msDS-SecondaryKrbTgtNumber
+	 */
+	if (torture_setting_bool(test_context->tctx, "expect_cached_at_rodc", false)) {
+		torture_assert_int_not_equal(test_context->tctx,
+					     *test_context->tgs_rep.ticket.enc_part.kvno & 0xFFFF0000,
+					     0, "Did not get a RODC number in the KVNO");
+	} else {
+		torture_assert_int_equal(test_context->tctx,
+					 *test_context->tgs_rep.ticket.enc_part.kvno & 0xFFFF0000,
+					 0, "Unexpecedly got a RODC number in the KVNO");
+	}
+	free_TGS_REP(&test_context->tgs_rep);
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->packet_count, 0,
+				 "too many packets");
+	test_context->packet_count = 0;
+	test_context->test_stage = TEST_TGS_REQ;
+	free_TGS_REQ(&test_context->tgs_req);
+	return true;
+}
+
+/*
+ * TEST_TGS_REQ
+ *
+ * Confirm that the outgoing TGS-REQ packet from krb5_mk_req_exact()
+ * certain expectations, like that the canonicalize bit is set (this
+ * test is to force that handling) and that if an enterprise name was
+ * requested, that it was sent.
+ *
+ */
+
+static bool torture_krb5_pre_send_tgs_req_test(struct torture_krb5_context *test_context, const krb5_data *send_buf, krb5_data *modified_send_buf)
+{
+	size_t used;
+	torture_assert_int_equal(test_context->tctx,
+				 decode_TGS_REQ(send_buf->data, send_buf->length,
+						&test_context->tgs_req, &used),
+				 0, "decode_TGS_REQ for TEST_TGS_REQ test failed");
+	torture_assert_int_equal(test_context->tctx, used, send_buf->length, "length mismatch");
+	torture_assert_int_equal(test_context->tctx, test_context->tgs_req.pvno, 5,
+				 "Got wrong as_req->pvno");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.kdc_options.canonicalize,
+				 false,
+				 "krb5 libs unexpectedly set canonicalize!");
+
+	if (test_context->test_data->enterprise) {
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.sname->name_type,
+					 KRB5_NT_ENTERPRISE_PRINCIPAL,
+					 "Mismatch in name type between request and expected request, expected  KRB5_NT_ENTERPRISE_PRINCIPAL");
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.realm,
+					 test_context->test_data->real_realm,
+					 "Mismatch in realm between request and expected request");
+
+	} else {
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.sname->name_type,
+					 KRB5_NT_PRINCIPAL,
+					 "Mismatch in name type between request and expected request, expected  KRB5_NT_PRINCIPAL");
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.realm,
+					 test_context->test_data->realm,
+					 "Mismatch in realm between request and expected request");
+
+	}
+
+	*modified_send_buf = *send_buf;
+
+	return true;
+}
+
+/*
+ * TEST_TGS_REQ - RECV
+ *
+ * Confirm that the reply TGS-REP packet for krb5_mk_req_exact(), for
+ * the actual target service.
+ *
+ */
+
+static bool torture_krb5_post_recv_tgs_req_test(struct torture_krb5_context *test_context, const krb5_data *recv_buf)
+{
+	KRB_ERROR error;
+	size_t used;
+	/*
+	 * If this account did not have a servicePrincipalName, then
+	 * we expect a errro packet, not a TGS-REQ
+	 */
+	if (decode_KRB_ERROR(recv_buf->data, recv_buf->length, &error, &used) == 0) {
+		torture_assert_int_equal(test_context->tctx,
+					 used, recv_buf->length,
+					 "length mismatch");
+		torture_assert_int_equal(test_context->tctx,
+					 error.pvno, 5,
+					 "Got wrong error.pvno");
+		torture_assert_int_equal(test_context->tctx,
+					 error.error_code,
+					 KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN - KRB5KDC_ERR_NONE,
+					 "Got wrong error.error_code");
+	} else {
+		torture_assert_int_equal(test_context->tctx,
+					 decode_TGS_REP(recv_buf->data, recv_buf->length,
+							&test_context->tgs_rep, &used),
+					 0,
+					 "decode_TGS_REP failed");
+		torture_assert_int_equal(test_context->tctx, used, recv_buf->length,
+					 "length mismatch");
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_rep.pvno, 5,
+					 "Got wrong as_rep->pvno");
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_rep.ticket.tkt_vno, 5,
+					 "Got wrong as_rep->ticket.tkt_vno");
+		torture_assert(test_context->tctx,
+			       test_context->tgs_rep.ticket.enc_part.kvno,
+			       "Did not get a KVNO in test_context->as_rep.ticket.enc_part.kvno");
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_rep.ticket.realm,
+					 test_context->test_data->real_realm,
+					 "Mismatch in realm between ticket response and expected upper case REALM");
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.sname->name_type,
+					 test_context->tgs_rep.ticket.sname.name_type, "Mismatch in name_type between request and ticket response");
+		torture_assert_int_equal(test_context->tctx,
+					 *test_context->tgs_rep.ticket.enc_part.kvno & 0xFFFF0000,
+					 0, "Unexpecedly got a RODC number in the KVNO, should just be principal KVNO");
+		free_TGS_REP(&test_context->tgs_rep);
+	}
+	torture_assert(test_context->tctx, test_context->packet_count < 3, "too many packets");
+	free_TGS_REQ(&test_context->tgs_req);
+	test_context->test_stage = TEST_DONE;
+	return true;
+}
+
+/*
+ * TEST_TGS_REQ_KRBTGT
+ *
+ *
+ * Confirm that the outgoing TGS-REQ packet from krb5_mk_req_exact()
+ * for the krbtgt/realm principal meets certain expectations, like
+ * that the canonicalize bit is not set
+ *
+ */
+
+static bool torture_krb5_pre_send_tgs_req_krbtgt_test(struct torture_krb5_context *test_context, const krb5_data *send_buf, krb5_data *modified_send_buf)
+{
+	size_t used;
+	torture_assert_int_equal(test_context->tctx,
+				 decode_TGS_REQ(send_buf->data, send_buf->length,
+						&test_context->tgs_req, &used),
+				 0, "decode_TGS_REQ for TEST_TGS_REQ test failed");
+	torture_assert_int_equal(test_context->tctx,
+				 used, send_buf->length,
+				 "length mismatch");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_req.pvno, 5,
+				 "Got wrong as_req->pvno");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.kdc_options.canonicalize,
+				 false,
+				 "krb5 libs unexpectedly set canonicalize!");
+
+	torture_assert_str_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.realm,
+				 test_context->test_data->realm,
+				 "Mismatch in realm between request and expected request");
+
+	*modified_send_buf = *send_buf;
+	test_context->test_stage = TEST_DONE;
+	return true;
+}
+
+/*
+ * TEST_TGS_REQ_HOST, TEST_TGS_REQ_HOST_SRV_INST and TEST_TGS_REQ_HOST_SRV_HST
+ *
+ *
+ * Confirm that the outgoing TGS-REQ packet from krb5_mk_req_exact()
+ * for the krbtgt/realm principal meets certain expectations, like
+ * that the canonicalize bit is not set
+ *
+ */
+
+static bool torture_krb5_pre_send_tgs_req_host_test(struct torture_krb5_context *test_context, const krb5_data *send_buf, krb5_data *modified_send_buf)
+{
+	size_t used;
+	torture_assert_int_equal(test_context->tctx,
+				 decode_TGS_REQ(send_buf->data, send_buf->length,
+						&test_context->tgs_req, &used),
+				 0, "decode_TGS_REQ for TEST_TGS_REQ test failed");
+	torture_assert_int_equal(test_context->tctx,
+				 used, send_buf->length,
+				 "length mismatch");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_req.pvno, 5,
+				 "Got wrong as_req->pvno");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.sname->name_string.len, 2,
+				 "Mismatch in name between request and expected request, expected krbtgt/realm");
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.kdc_options.canonicalize,
+					 true,
+					 "krb5 libs unexpectedly did not set canonicalize!");
+
+	if (test_context->test_stage == TEST_TGS_REQ_HOST_SRV_INST) {
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.sname->name_type, KRB5_NT_SRV_INST,
+					 "Mismatch in name type between request and expected request, expected KRB5_NT_SRV_INST");
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.sname->name_string.val[0],
+					 strupper_talloc(test_context, test_context->test_data->krb5_service),
+					 "Mismatch in name between request and expected request, expected service");
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.sname->name_string.val[1],
+					 test_context->test_data->krb5_hostname,
+					 "Mismatch in hostname part between request and expected request");
+
+	} else if (test_context->test_stage == TEST_TGS_REQ_HOST_SRV_HST) {
+
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.sname->name_type, KRB5_NT_SRV_HST,
+					 "Mismatch in name type between request and expected request, expected KRB5_NT_SRV_HST");
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.sname->name_string.val[0],
+					 test_context->test_data->krb5_service,
+					 "Mismatch in name between request and expected request, expected service");
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.sname->name_string.val[1],
+					 strupper_talloc(test_context, test_context->test_data->krb5_hostname),
+					 "Mismatch in hostname part between request and expected request");
+
+	} else {
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.sname->name_type, KRB5_NT_PRINCIPAL,
+					 "Mismatch in name type between request and expected request, expected  KRB5_NT_PRINCIPAL");
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.sname->name_string.val[0],
+					 test_context->test_data->krb5_service,
+					 "Mismatch in name between request and expected request, expected service");
+		torture_assert_str_equal(test_context->tctx,
+					 test_context->tgs_req.req_body.sname->name_string.val[1],
+					 test_context->test_data->krb5_hostname,
+					 "Mismatch in hostname part between request and expected request");
+
+	}
+	torture_assert_str_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.realm,
+				 test_context->test_data->real_realm,
+				 "Mismatch in realm between request and expected request");
+
+	*modified_send_buf = *send_buf;
+	return true;
+}
+
+/*
+ * TEST_TGS_REQ_HOST, TEST_TGS_REQ_HOST_SRV_INST, TEST_TGS_REQ_HOST_SRV_HST - RECV
+ *
+ * Confirm that the reply TGS-REP packet for krb5_mk_req(), for
+ * the actual target service, as a SPN, not a any other name type.
+ *
+ */
+
+static bool torture_krb5_post_recv_tgs_req_host_test(struct torture_krb5_context *test_context, const krb5_data *recv_buf)
+{
+	size_t used;
+	torture_assert_int_equal(test_context->tctx,
+				 decode_TGS_REP(recv_buf->data, recv_buf->length,
+						&test_context->tgs_rep, &used),
+				 0,
+				 "decode_TGS_REP failed");
+	torture_assert_int_equal(test_context->tctx, used, recv_buf->length,
+				 "length mismatch");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_rep.pvno, 5,
+				 "Got wrong as_rep->pvno");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.tkt_vno, 5,
+				 "Got wrong as_rep->ticket.tkt_vno");
+	torture_assert(test_context->tctx,
+		       test_context->tgs_rep.ticket.enc_part.kvno,
+		       "Did not get a KVNO in test_context->as_rep.ticket.enc_part.kvno");
+	torture_assert_str_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.realm,
+				 test_context->test_data->real_realm,
+				 "Mismatch in realm between ticket response and expected upper case REALM");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_req.req_body.sname->name_type,
+				 test_context->tgs_rep.ticket.sname.name_type, "Mismatch in name_type between request and ticket response");
+	torture_assert_int_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.sname.name_string.len, 2,
+				 "Mismatch in name between request and expected request, expected service/hostname");
+	torture_assert_str_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.sname.name_string.val[0],
+				 test_context->tgs_req.req_body.sname->name_string.val[0],
+				 "Mismatch in name between request and expected request, expected service/hostname");
+	torture_assert_str_equal(test_context->tctx,
+				 test_context->tgs_rep.ticket.sname.name_string.val[1],
+				 test_context->tgs_req.req_body.sname->name_string.val[1],
+				 "Mismatch in name between request and expected request, expected service/hostname");
+
+	torture_assert_int_equal(test_context->tctx,
+				 *test_context->tgs_rep.ticket.enc_part.kvno & 0xFFFF0000,
+				 0, "Unexpecedly got a RODC number in the KVNO, should just be principal KVNO");
+	free_TGS_REP(&test_context->tgs_rep);
+
+	torture_assert(test_context->tctx, test_context->packet_count < 2, "too many packets");
+	return true;
+}
+
+/*
+ * TEST_AS_REQ_SELF - RECV
+ *
+ * Confirm that the reply packet from the KDC meets certain
+ * expectations as part of TEST_AS_REQ.  This uses a packet count to
+ * work out what packet we are up to in the multiple exchanged
+ * triggerd by krb5_get_init_creds_password().
+ *
+ */
+
+static bool torture_krb5_post_recv_as_req_self_test(struct torture_krb5_context *test_context,
+						    const krb5_data *recv_buf)
+{
+	KRB_ERROR error;
+	size_t used;
+	if (test_context->packet_count == 0) {
+		krb5_error_code k5ret;
+		/*
+		 * The client libs obtain the salt by attempting to
+		 * authenticate without pre-authentication and getting
+		 * the correct salt with the
+		 * KRB5KDC_ERR_PREAUTH_REQUIRED error.  If we are in
+		 * the test (netbios_realm && upn) that deliberatly
+		 * has an incorrect principal, we check we get the
+		 * correct error.
+		 */
+		k5ret = decode_KRB_ERROR(recv_buf->data, recv_buf->length,
+					 &error, &used);
+		if (k5ret != 0) {
+			AS_REP as_rep;
+			k5ret = decode_AS_REP(recv_buf->data, recv_buf->length,
+				      &as_rep, &used);
+			if (k5ret == 0) {
+				if (torture_setting_bool(test_context->tctx, "expect_machine_account", false) == false
+				    || (test_context->test_data->upn == true)) {
+					torture_assert(test_context->tctx, false,
+						       "expected to get a KRB_ERROR packet with "
+						       "KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN or KRB5KDC_ERR_PREAUTH_REQUIRED, got valid AS-REP");
+				} else {
+					torture_assert(test_context->tctx, false,
+						       "expected to get a KRB_ERROR packet with "
+						       "KRB5KDC_ERR_PREAUTH_REQUIRED, got valid AS-REP");
+				}
+			} else {
+				if (torture_setting_bool(test_context->tctx, "expect_machine_account", false) == false
+				    || (test_context->test_data->upn == true)) {
+					torture_assert(test_context->tctx, false,
+						       "unable to decode as KRB-ERROR or AS-REP, "
+						       "expected to get a KRB_ERROR packet with KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN or KRB5KDC_ERR_PREAUTH_REQUIRED");
+				} else {
+					torture_assert(test_context->tctx, false,
+						       "unable to decode as KRB-ERROR or AS-REP, "
+						       "expected to get a KRB_ERROR packet with KRB5KDC_ERR_PREAUTH_REQUIRED");
+				}
+			}
+		}
+		torture_assert_int_equal(test_context->tctx, used, recv_buf->length,
+					 "length mismatch");
+		torture_assert_int_equal(test_context->tctx, error.pvno, 5,
+					 "Got wrong error.pvno");
+		if ((torture_setting_bool(test_context->tctx, "expect_machine_account", false) == false
+		     || (test_context->test_data->upn == true))
+		    && error.error_code == KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN - KRB5KDC_ERR_NONE) {
+			/*
+			 * IGNORE
+			 *
+			 * This case is because Samba's Heimdal KDC
+			 * checks server and client accounts before
+			 * checking for pre-authentication.
+			 */
+		} else {
+			torture_assert_int_equal(test_context->tctx,
+						 error.error_code,
+						 KRB5KDC_ERR_PREAUTH_REQUIRED - KRB5KDC_ERR_NONE,
+						 "Got wrong error.error_code");
+		}
+
+		free_KRB_ERROR(&error);
+	} else if ((decode_KRB_ERROR(recv_buf->data, recv_buf->length, &error, &used) == 0)
+		   && (test_context->packet_count == 1)) {
+		/*
+		 * The Windows 2012R2 KDC will always respond with
+		 * KRB5KRB_ERR_RESPONSE_TOO_BIG over UDP as the ticket
+		 * won't fit, because of the PAC.  (It appears to do
+		 * this always, even if it will).  This triggers the
+		 * client to try again over TCP.
+		 */
+		torture_assert_int_equal(test_context->tctx,
+					 used, recv_buf->length,
+					 "length mismatch");
+		torture_assert_int_equal(test_context->tctx,
+					 error.pvno, 5,
+					 "Got wrong error.pvno");
+		if ((torture_setting_bool(test_context->tctx, "expect_machine_account", false)
+		     && (test_context->test_data->upn == false))) {
+			torture_assert_int_equal(test_context->tctx,
+						 error.error_code,
+						 KRB5KRB_ERR_RESPONSE_TOO_BIG - KRB5KDC_ERR_NONE,
+						 "Got wrong error.error_code");
+		} else {
+			torture_assert_int_equal(test_context->tctx,
+						 error.error_code,
+						 KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN - KRB5KDC_ERR_NONE,
+						 "Got wrong error.error_code");
+		}
+		free_KRB_ERROR(&error);
+	} else {
+		/*
+		 * Finally the successful packet.
+		 */
+		torture_assert_int_equal(test_context->tctx,
+					 decode_AS_REP(recv_buf->data, recv_buf->length,
+						       &test_context->as_rep, &used), 0,
+					 "decode_AS_REP failed");
+		torture_assert_int_equal(test_context->tctx, used, recv_buf->length,
+					 "length mismatch");
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->as_rep.pvno, 5,
+					 "Got wrong as_rep->pvno");
+		torture_assert_int_equal(test_context->tctx,
+					 test_context->as_rep.ticket.tkt_vno, 5,
+					 "Got wrong as_rep->ticket.tkt_vno");
+		torture_assert(test_context->tctx,
+			       test_context->as_rep.ticket.enc_part.kvno,
+			       "Did not get a KVNO in test_context->as_rep.ticket.enc_part.kvno");
+
+		/*
+		 * We do not expect an RODC number here in the KVNO,
+		 * as this is a ticket to the user's own account.
+		 */
+		torture_assert_int_equal(test_context->tctx,
+					 *test_context->as_rep.ticket.enc_part.kvno & 0xFFFF0000,
+					 0, "Unexpecedly got a RODC number in the KVNO");
+		free_AS_REP(&test_context->as_rep);
+	}
+	torture_assert(test_context->tctx, test_context->packet_count < 3, "too many packets");
+	free_AS_REQ(&test_context->as_req);
+	return true;
+}
+
+/*
+ * This function is set in torture_krb5_init_context_canon as krb5
+ * send_and_recv function.  This allows us to override what server the
+ * test is aimed at, and to inspect the packets just before they are
+ * sent to the network, and before they are processed on the recv
+ * side.
+ *
+ * The torture_krb5_pre_send_test() and torture_krb5_post_recv_test()
+ * functions are implement the actual tests.
+ *
+ * When this asserts, the caller will get a spurious 'cannot contact
+ * any KDC' message.
+ *
+ */
+static krb5_error_code smb_krb5_send_and_recv_func_canon_override(krb5_context context,
+								   void *data, /* struct torture_krb5_context */
+								   krb5_krbhst_info *hi,
+								   time_t timeout,
+								   const krb5_data *send_buf,
+								   krb5_data *recv_buf)
+{
+	krb5_error_code k5ret;
+	bool ok = false;
+	krb5_data modified_send_buf;
+
+	struct torture_krb5_context *test_context
+		= talloc_get_type_abort(data, struct torture_krb5_context);
+
+	switch (test_context->test_stage) {
+	case TEST_DONE:
+		torture_warning(test_context->tctx, "Unexpected outgoing packet from krb5 libs");
+		return EINVAL;
+	case TEST_AS_REQ:
+		ok = torture_krb5_pre_send_as_req_test(test_context, send_buf,
+							      &modified_send_buf);
+		break;
+	case TEST_TGS_REQ_KRBTGT_CANON:
+		ok = torture_krb5_pre_send_tgs_req_krbtgt_canon_test(test_context, send_buf,
+								     &modified_send_buf);
+		break;
+	case TEST_TGS_REQ_CANON:
+		ok = torture_krb5_pre_send_tgs_req_canon_test(test_context, send_buf,
+							      &modified_send_buf);
+		break;
+	case TEST_SELF_TRUST_TGS_REQ:
+		ok = torture_krb5_pre_send_self_trust_tgs_req_test(test_context, send_buf,
+								   &modified_send_buf);
+		break;
+	case TEST_TGS_REQ:
+		ok = torture_krb5_pre_send_tgs_req_test(test_context, send_buf,
+							&modified_send_buf);
+		break;
+	case TEST_TGS_REQ_KRBTGT:
+		ok = torture_krb5_pre_send_tgs_req_krbtgt_test(test_context, send_buf,
+							       &modified_send_buf);
+		break;
+	case TEST_TGS_REQ_HOST:
+	case TEST_TGS_REQ_HOST_SRV_INST:
+	case TEST_TGS_REQ_HOST_SRV_HST:
+		ok = torture_krb5_pre_send_tgs_req_host_test(test_context, send_buf,
+							     &modified_send_buf);
+		break;
+	case TEST_AS_REQ_SELF:
+		ok = torture_krb5_pre_send_as_req_test(test_context, send_buf,
+						       &modified_send_buf);
+		break;
+	}
+	if (ok == false) {
+		return EINVAL;
+	}
+
+	k5ret = smb_krb5_send_and_recv_func_forced(context, test_context->server,
+						   hi, timeout, &modified_send_buf,
+						   recv_buf);
+	if (k5ret != 0) {
+		return k5ret;
+	}
+
+	switch (test_context->test_stage) {
+	case TEST_DONE:
+		torture_warning(test_context->tctx, "Unexpected outgoing packet from krb5 libs");
+		return EINVAL;
+	case TEST_AS_REQ:
+		ok = torture_krb5_post_recv_as_req_test(test_context, recv_buf);
+		break;
+	case TEST_TGS_REQ_KRBTGT_CANON:
+		ok = torture_krb5_post_recv_tgs_req_krbtgt_canon_test(test_context, recv_buf);
+		break;
+	case TEST_TGS_REQ_CANON:
+		ok = torture_krb5_post_recv_tgs_req_canon_test(test_context, recv_buf);
+		break;
+	case TEST_SELF_TRUST_TGS_REQ:
+		ok = torture_krb5_post_recv_self_trust_tgs_req_test(test_context, recv_buf);
+		break;
+	case TEST_TGS_REQ:
+		ok = torture_krb5_post_recv_tgs_req_test(test_context, recv_buf);
+		break;
+	case TEST_TGS_REQ_KRBTGT:
+		ok = torture_krb5_post_recv_self_trust_tgs_req_test(test_context, recv_buf);
+		break;
+	case TEST_TGS_REQ_HOST:
+	case TEST_TGS_REQ_HOST_SRV_INST:
+	case TEST_TGS_REQ_HOST_SRV_HST:
+		ok = torture_krb5_post_recv_tgs_req_host_test(test_context, recv_buf);
+		break;
+	case TEST_AS_REQ_SELF:
+		ok = torture_krb5_post_recv_as_req_self_test(test_context, recv_buf);
+		break;
+	}
+	if (ok == false) {
+		KRB_ERROR error;
+		size_t used;
+		torture_warning(test_context->tctx, "Packet of length %llu failed post-recv checks in test stage %d", (unsigned long long)recv_buf->length, test_context->test_stage);
+		if (decode_KRB_ERROR(recv_buf->data, recv_buf->length, &error, &used) == 0) {
+			torture_warning(test_context->tctx,
+					"STAGE: %d Unexpectedly got a KRB-ERROR packet "
+					"with error code %d (%s)",
+					test_context->test_stage,
+					error.error_code,
+					error_message(error.error_code + KRB5KDC_ERR_NONE));
+			free_KRB_ERROR(&error);
+		}
+		return EINVAL;
+	}
+
+	test_context->packet_count++;
+
+	return k5ret;
+}
+
+static int test_context_destructor(struct torture_krb5_context *test_context)
+{
+	freeaddrinfo(test_context->server);
+	return 0;
+}
+
+
+static bool torture_krb5_init_context_canon(struct torture_context *tctx,
+					     struct test_data *test_data,
+					     struct torture_krb5_context **torture_krb5_context)
+{
+	const char *host = torture_setting_string(tctx, "host", NULL);
+	krb5_error_code k5ret;
+	bool ok;
+
+	struct torture_krb5_context *test_context = talloc_zero(tctx, struct torture_krb5_context);
+	torture_assert(tctx, test_context != NULL, "Failed to allocate");
+
+	test_context->test_data = test_data;
+	test_context->tctx = tctx;
+
+	k5ret = smb_krb5_init_context(test_context, tctx->lp_ctx, &test_context->smb_krb5_context);
+	torture_assert_int_equal(tctx, k5ret, 0, "smb_krb5_init_context failed");
+
+	ok = interpret_string_addr_internal(&test_context->server, host, AI_NUMERICHOST);
+	torture_assert(tctx, ok, "Failed to parse target server");
+
+	talloc_set_destructor(test_context, test_context_destructor);
+
+	set_sockaddr_port(test_context->server->ai_addr, 88);
+
+	k5ret = krb5_set_send_to_kdc_func(test_context->smb_krb5_context->krb5_context,
+					  smb_krb5_send_and_recv_func_canon_override,
+					  test_context);
+	torture_assert_int_equal(tctx, k5ret, 0, "krb5_set_send_to_kdc_func failed");
+	*torture_krb5_context = test_context;
+	return true;
+}
+
+
+static bool torture_krb5_as_req_canon(struct torture_context *tctx, const void *tcase_data)
+{
+	krb5_error_code k5ret;
+	krb5_get_init_creds_opt *krb_options = NULL;
+	struct test_data *test_data = talloc_get_type_abort(tcase_data, struct test_data);
+	krb5_principal principal;
+	krb5_principal krbtgt_other;
+	krb5_principal expected_principal;
+	char *principal_string;
+	char *krbtgt_other_string;
+	int principal_flags;
+	char *expected_principal_string;
+	char *expected_unparse_principal_string;
+	int expected_principal_flags;
+	char *got_principal_string;
+	char *assertion_message;
+	const char *password = cli_credentials_get_password(cmdline_credentials);
+	krb5_context k5_context;
+	struct torture_krb5_context *test_context;
+	bool ok;
+	krb5_creds my_creds;
+	krb5_creds *server_creds;
+	krb5_ccache ccache;
+	krb5_auth_context auth_context;
+	char *cc_name;
+	krb5_data in_data, enc_ticket;
+	krb5_get_creds_opt opt;
+
+	const char *upn = torture_setting_string(tctx, "krb5-upn", "");
+	test_data->krb5_service = torture_setting_string(tctx, "krb5-service", "host");
+	test_data->krb5_hostname = torture_setting_string(tctx, "krb5-hostname", "");
+
+	/*
+	 * If we have not passed a UPN on the command line,
+	 * then skip the UPN tests.
+	 */
+	if (test_data->upn && upn[0] == '\0') {
+		torture_skip(tctx, "This test needs a UPN specified as --option=torture:krb5-upn=user@example.com to run");
+	}
+
+	if (test_data->removedollar &&
+	    !torture_setting_bool(tctx, "run_removedollar_test", false))
+	{
+		torture_skip(tctx, "--option=torture:run_removedollar_test=true not specified");
+	}
+
+	if (test_data->netbios_realm) {
+		test_data->realm = test_data->real_domain;
+	} else {
+		test_data->realm = test_data->real_realm;
+	}
+
+	if (test_data->upn) {
+		char *p;
+		test_data->username = talloc_strdup(test_data, upn);
+		p = strchr(test_data->username, '@');
+		if (p) {
+			*p = '\0';
+			p++;
+		}
+		/*
+		 * Test the UPN behaviour carefully.  We can
+		 * test in two different modes, depending on
+		 * what UPN has been set up for us.
+		 *
+		 * If the UPN is in our realm, then we do all the tests with this name also.
+		 *
+		 * If the UPN is not in our realm, then we
+		 * expect the tests that replace the realm to
+		 * fail (as it won't match)
+		 */
+		if (strcasecmp(p, test_data->real_realm) != 0) {
+			test_data->other_upn_suffix = true;
+		} else {
+			test_data->other_upn_suffix = false;
+		}
+
+		/*
+		 * This lets us test the combination of the UPN prefix
+		 * with a valid domain, without adding even more
+		 * combinations
+		 */
+		if (test_data->netbios_realm == false) {
+			test_data->realm = p;
+		}
+	}
+
+	ok = torture_krb5_init_context_canon(tctx, test_data, &test_context);
+	torture_assert(tctx, ok, "torture_krb5_init_context failed");
+	k5_context = test_context->smb_krb5_context->krb5_context;
+
+	if (test_data->upper_realm) {
+		test_data->realm = strupper_talloc(test_data, test_data->realm);
+	} else {
+		test_data->realm = strlower_talloc(test_data, test_data->realm);
+	}
+	if (test_data->upper_username) {
+		test_data->username = strupper_talloc(test_data, test_data->username);
+	} else {
+		test_data->username = talloc_strdup(test_data, test_data->username);
+	}
+
+	if (test_data->removedollar) {
+		char *p;
+
+		p = strchr_m(test_data->username, '$');
+		torture_assert(tctx, p != NULL, talloc_asprintf(tctx,
+			       "username[%s] contains no '$'\n",
+			       test_data->username));
+		*p = '\0';
+	}
+
+	principal_string = talloc_asprintf(test_data, "%s@%s", test_data->username, test_data->realm);
+
+	/*
+	 * If we are set to canonicalize, we get back the fixed UPPER
+	 * case realm, and the real username (ie matching LDAP
+	 * samAccountName)
+	 *
+	 * Otherwise, if we are set to enterprise, we
+	 * get back the whole principal as-sent
+	 *
+	 * Finally, if we are not set to canonicalize, we get back the
+	 * fixed UPPER case realm, but the as-sent username
+	 */
+	if (test_data->canonicalize) {
+		expected_principal_string = talloc_asprintf(test_data,
+							    "%s@%s",
+							    test_data->real_username,
+							    test_data->real_realm);
+	} else if (test_data->enterprise) {
+		expected_principal_string = principal_string;
+	} else {
+		expected_principal_string = talloc_asprintf(test_data,
+							    "%s@%s",
+							    test_data->username,
+							    test_data->real_realm);
+	}
+
+	if (test_data->enterprise) {
+		principal_flags = KRB5_PRINCIPAL_PARSE_ENTERPRISE;
+	} else {
+		if (test_data->upn && test_data->other_upn_suffix) {
+			torture_skip(tctx, "UPN test for UPN with other UPN suffix only runs with enterprise principals");
+		}
+		principal_flags = 0;
+	}
+
+	if (test_data->canonicalize) {
+		expected_principal_flags = 0;
+	} else {
+		expected_principal_flags = principal_flags;
+	}
+
+	torture_assert_int_equal(tctx,
+				 krb5_parse_name_flags(k5_context,
+						       principal_string,
+						       principal_flags,
+						       &principal),
+					 0, "krb5_parse_name_flags failed");
+	torture_assert_int_equal(tctx,
+				 krb5_parse_name_flags(k5_context,
+						       expected_principal_string,
+						       expected_principal_flags,
+						       &expected_principal),
+				 0, "krb5_parse_name_flags failed");
+
+	torture_assert_int_equal(tctx,
+				 krb5_unparse_name(k5_context,
+						   expected_principal,
+						   &expected_unparse_principal_string),
+				 0, "krb5_unparse_name failed");
+	/*
+	 * Prepare a AS-REQ and run the TEST_AS_REQ tests
+	 *
+	 */
+
+	test_context->test_stage = TEST_AS_REQ;
+	test_context->packet_count = 0;
+
+	/*
+	 * Set the canonicalize flag if this test requires it
+	 */
+	torture_assert_int_equal(tctx,
+				 krb5_get_init_creds_opt_alloc(k5_context, &krb_options),
+				 0, "krb5_get_init_creds_opt_alloc failed");
+
+	torture_assert_int_equal(tctx,
+				 krb5_get_init_creds_opt_set_canonicalize(k5_context,
+									  krb_options,
+									  test_data->canonicalize),
+				 0, "krb5_get_init_creds_opt_set_canonicalize failed");
+
+	torture_assert_int_equal(tctx,
+				 krb5_get_init_creds_opt_set_win2k(k5_context,
+								   krb_options,
+								   test_data->win2k),
+				 0, "krb5_get_init_creds_opt_set_win2k failed");
+
+	k5ret = krb5_get_init_creds_password(k5_context, &my_creds, principal,
+					     password, NULL, NULL, 0,
+					     NULL, krb_options);
+
+	if (test_data->netbios_realm && test_data->upn) {
+		torture_assert_int_equal(tctx, k5ret,
+					 KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN,
+					 "Got wrong error_code from krb5_get_init_creds_password");
+		/* We can't proceed with more checks */
+		return true;
+	} else {
+		assertion_message = talloc_asprintf(tctx,
+						    "krb5_get_init_creds_password for %s failed: %s",
+						    principal_string,
+						    smb_get_krb5_error_message(k5_context, k5ret, tctx));
+		torture_assert_int_equal(tctx, k5ret, 0, assertion_message);
+	}
+
+	torture_assert(tctx,
+		       test_context->packet_count > 1,
+		       "Expected krb5_get_init_creds_password to send more packets");
+
+	/*
+	 * Assert that the reply was with the correct type of
+	 * principal, depending on the flags we set
+	 */
+	if (test_data->canonicalize == false && test_data->enterprise) {
+		torture_assert_int_equal(tctx,
+					 krb5_principal_get_type(k5_context,
+								 my_creds.client),
+					 KRB5_NT_ENTERPRISE_PRINCIPAL,
+					 "smb_krb5_init_context gave incorrect client->name.name_type");
+	} else {
+		torture_assert_int_equal(tctx,
+					 krb5_principal_get_type(k5_context,
+								 my_creds.client),
+					 KRB5_NT_PRINCIPAL,
+					 "smb_krb5_init_context gave incorrect client->name.name_type");
+	}
+
+	torture_assert_int_equal(tctx,
+				 krb5_unparse_name(k5_context,
+						   my_creds.client, &got_principal_string), 0,
+				 "krb5_unparse_name failed");
+
+	assertion_message = talloc_asprintf(tctx,
+					    "krb5_get_init_creds_password returned a different principal %s to what was expected %s",
+					    got_principal_string, expected_principal_string);
+	krb5_free_unparsed_name(k5_context, got_principal_string);
+
+	torture_assert(tctx, krb5_principal_compare(k5_context,
+						    my_creds.client, expected_principal),
+		       assertion_message);
+
+
+	torture_assert_int_equal(tctx,
+				 krb5_principal_get_type(k5_context,
+							 my_creds.server), KRB5_NT_SRV_INST,
+				 "smb_krb5_init_context gave incorrect server->name.name_type");
+
+	torture_assert_int_equal(tctx,
+				 krb5_principal_get_num_comp(k5_context,
+							     my_creds.server), 2,
+				 "smb_krb5_init_context gave incorrect number of components in my_creds.server->name");
+
+	torture_assert_str_equal(tctx,
+				 krb5_principal_get_comp_string(k5_context,
+								my_creds.server, 0),
+				 "krbtgt",
+				 "smb_krb5_init_context gave incorrect my_creds.server->name.name_string[0]");
+
+	if (test_data->canonicalize || test_data->enterprise) {
+		torture_assert_str_equal(tctx,
+					 krb5_principal_get_comp_string(k5_context,
+									my_creds.server, 1),
+					 test_data->real_realm,
+
+					 "smb_krb5_init_context gave incorrect my_creds.server->name.name_string[1]");
+	} else {
+		torture_assert_str_equal(tctx,
+					 krb5_principal_get_comp_string(k5_context,
+									my_creds.server, 1),
+					 test_data->realm,
+
+					 "smb_krb5_init_context gave incorrect my_creds.server->name.name_string[1]");
+	}
+	torture_assert_str_equal(tctx,
+				 krb5_principal_get_realm(k5_context,
+							  my_creds.server),
+				 test_data->real_realm,
+				 "smb_krb5_init_context gave incorrect my_creds.server->realm");
+
+	/* Store the result of the 'kinit' above into a memory ccache */
+	cc_name = talloc_asprintf(tctx, "MEMORY:%s", test_data->test_name);
+	torture_assert_int_equal(tctx, krb5_cc_resolve(k5_context, cc_name,
+						       &ccache),
+				 0, "krb5_cc_resolve failed");
+
+	torture_assert_int_equal(tctx, krb5_cc_initialize(k5_context,
+							  ccache, my_creds.client),
+				 0, "krb5_cc_initialize failed");
+
+	torture_assert_int_equal(tctx, krb5_cc_store_cred(k5_context,
+							  ccache, &my_creds),
+				 0, "krb5_cc_store_cred failed");
+
+	/*
+	 * Prepare a TGS-REQ and run the TEST_TGS_REQ_KRBTGT_CANON tests
+	 *
+	 * This tests krb5_get_creds behaviour, which allows us to set
+	 * the KRB5_GC_CANONICALIZE option against the krbtgt/ principal
+	 */
+
+	krbtgt_other_string = talloc_asprintf(test_data, "krbtgt/%s@%s", test_data->real_domain, test_data->real_realm);
+	torture_assert_int_equal(tctx,
+				 krb5_make_principal(k5_context, &krbtgt_other,
+						     test_data->real_realm, "krbtgt",
+						     test_data->real_domain, NULL),
+				 0, "krb5_make_principal failed");
+
+	test_context->test_stage = TEST_TGS_REQ_KRBTGT_CANON;
+	test_context->packet_count = 0;
+
+	torture_assert_int_equal(tctx,
+				 krb5_get_creds_opt_alloc(k5_context, &opt),
+				 0, "krb5_get_creds_opt_alloc");
+
+	krb5_get_creds_opt_add_options(k5_context,
+				       opt,
+				       KRB5_GC_CANONICALIZE);
+
+	krb5_get_creds_opt_add_options(k5_context,
+				       opt,
+				       KRB5_GC_NO_STORE);
+
+	/* Confirm if we can get a ticket krbtgt/realm that we got back with the initial kinit */
+	k5ret = krb5_get_creds(k5_context, opt, ccache, krbtgt_other, &server_creds);
+
+	if (test_data->canonicalize == false && test_data->enterprise == false
+	    && test_data->netbios_realm && test_data->upper_realm) {
+		/*
+		 * In these situations, the code above does store a
+		 * principal in the credentials cache matching what
+		 * krb5_get_creds() needs, so the test succeds, with no packets.
+		 *
+		 */
+		assertion_message = talloc_asprintf(tctx,
+						    "krb5_get_creds for %s failed with: %s",
+						    krbtgt_other_string,
+						    smb_get_krb5_error_message(k5_context, k5ret,
+									       tctx));
+
+		torture_assert_int_equal(tctx, k5ret, 0, assertion_message);
+		torture_assert_int_equal(tctx,
+					 test_context->packet_count,
+					 0, "Expected krb5_get_creds not to send packets");
+	} else if (test_data->canonicalize == false && test_data->enterprise == false
+		   && (test_data->upper_realm == false || test_data->netbios_realm == true)) {
+		torture_assert_int_equal(tctx, k5ret, KRB5_CC_NOTFOUND,
+					 "krb5_get_creds should have failed with KRB5_CC_NOTFOUND");
+	} else {
+
+		/*
+		 * In these situations, the code above does not store a
+		 * principal in the credentials cache matching what
+		 * krb5_get_creds() needs without talking to the KDC, so the
+		 * test fails with looping detected because when we set
+		 * canonicalize we confuse the client libs.
+		 *
+		 */
+		assertion_message = talloc_asprintf(tctx,
+						    "krb5_get_creds for %s should have failed with looping detected: %s",
+						    krbtgt_other_string,
+						    smb_get_krb5_error_message(k5_context, k5ret,
+									       tctx));
+
+		torture_assert_int_equal(tctx, k5ret, KRB5_GET_IN_TKT_LOOP, assertion_message);
+		torture_assert_int_equal(tctx,
+					 test_context->packet_count,
+					 2, "Expected krb5_get_creds to send packets");
+	}
+
+	/*
+	 * Prepare a TGS-REQ and run the TEST_TGS_REQ_CANON tests
+	 *
+	 * This tests krb5_get_creds behaviour, which allows us to set
+	 * the KRB5_GC_CANONICALIZE option
+	 */
+
+	test_context->test_stage = TEST_TGS_REQ_CANON;
+	test_context->packet_count = 0;
+
+	torture_assert_int_equal(tctx,
+				 krb5_get_creds_opt_alloc(k5_context, &opt),
+				 0, "krb5_get_creds_opt_alloc");
+
+	krb5_get_creds_opt_add_options(k5_context,
+				       opt,
+				       KRB5_GC_CANONICALIZE);
+
+	krb5_get_creds_opt_add_options(k5_context,
+				       opt,
+				       KRB5_GC_NO_STORE);
+
+	if (test_data->s4u2self) {
+		torture_assert_int_equal(tctx,
+					 krb5_get_creds_opt_set_impersonate(k5_context,
+									    opt,
+									    principal),
+					 0, "krb5_get_creds_opt_set_impersonate failed");
+	}
+
+	/* Confirm if we can get a ticket to our own name */
+	k5ret = krb5_get_creds(k5_context, opt, ccache, principal, &server_creds);
+
+	/*
+	 * In these situations, the code above does not store a
+	 * principal in the credentials cache matching what
+	 * krb5_get_creds() needs, so the test fails.
+	 *
+	 */
+	if (test_data->canonicalize == false && test_data->enterprise == false
+	    && (test_data->upper_realm == false || test_data->netbios_realm == true)) {
+		torture_assert_int_equal(tctx, k5ret, KRB5_CC_NOTFOUND,
+					 "krb5_get_creds should have failed with KRB5_CC_NOTFOUND");
+	} else {
+		assertion_message = talloc_asprintf(tctx,
+						    "krb5_get_creds for %s failed: %s",
+						    principal_string,
+						    smb_get_krb5_error_message(k5_context, k5ret,
+									       tctx));
+
+		/*
+		 * Only machine accounts (strictly, accounts with a
+		 * servicePrincipalName) can expect this test to succeed
+		 */
+		if (torture_setting_bool(tctx, "expect_machine_account", false)
+		    && (test_data->enterprise || test_data->upn == false)) {
+			torture_assert_int_equal(tctx, k5ret, 0, assertion_message);
+			torture_assert_int_equal(tctx, krb5_cc_store_cred(k5_context,
+									  ccache, server_creds),
+						 0, "krb5_cc_store_cred failed");
+
+			torture_assert_int_equal(tctx,
+						 krb5_free_creds(k5_context,
+								 server_creds),
+						 0, "krb5_free_cred_contents failed");
+
+		} else {
+			torture_assert_int_equal(tctx, k5ret, KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN,
+						 assertion_message);
+		}
+
+		torture_assert_int_equal(tctx,
+					 test_context->packet_count,
+					 1, "Expected krb5_get_creds to send packets");
+	}
+
+	/*
+	 * Confirm gettting a ticket to pass to the server, running
+	 * either the TEST_TGS_REQ or TEST_SELF_TRUST_TGS_REQ stage.
+	 *
+	 * This triggers the client to attempt to get a
+	 * cross-realm ticket between the alternate names of
+	 * the server, and we need to confirm that behaviour.
+	 *
+	 */
+
+	/*
+	 * This tries to guess when the krb5 libs will ask for a
+	 * cross-realm ticket, and when they will just ask the KDC
+	 * directly.
+	 */
+	if (test_context->test_data->canonicalize == false
+	    || test_context->test_data->enterprise
+	    || (test_context->test_data->upper_realm
+		&& test_context->test_data->netbios_realm == false)) {
+		test_context->test_stage = TEST_TGS_REQ;
+	} else {
+		test_context->test_stage = TEST_SELF_TRUST_TGS_REQ;
+	}
+
+	test_context->packet_count = 0;
+	torture_assert_int_equal(tctx, krb5_auth_con_init(k5_context, &auth_context),
+				 0, "krb5_auth_con_init failed");
+
+	in_data.length = 0;
+	k5ret = krb5_mk_req_exact(k5_context,
+				  &auth_context,
+				  AP_OPTS_USE_SUBKEY,
+				  principal,
+				  &in_data, ccache,
+				  &enc_ticket);
+	assertion_message = talloc_asprintf(tctx,
+					    "krb5_mk_req_exact for %s failed: %s",
+					    principal_string,
+					    smb_get_krb5_error_message(k5_context, k5ret, tctx));
+
+	/*
+	 * Only machine accounts (strictly, accounts with a
+	 * servicePrincipalName) can expect this test to succeed
+	 */
+	if (torture_setting_bool(tctx, "expect_machine_account", false) && (test_data->enterprise || test_data->upn == false)) {
+		DATA_BLOB client_to_server;
+		torture_assert_int_equal(tctx, k5ret, 0, assertion_message);
+		client_to_server = data_blob_const(enc_ticket.data, enc_ticket.length);
+		torture_assert(tctx,
+			       test_accept_ticket(tctx, cmdline_credentials,
+						  expected_unparse_principal_string,
+						  client_to_server),
+			       "test_accept_ticket failed - failed to accept the ticket we just created");
+		krb5_data_free(&enc_ticket);
+	} else {
+		torture_assert_int_equal(tctx, k5ret, KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN,
+					 assertion_message);
+	}
+
+	/*
+	 * Only in these cases would the above code have needed to
+	 * send packets to the network
+	 */
+	if (test_data->canonicalize == false && test_data->enterprise == false
+	    && (test_data->upper_realm == false || test_data->netbios_realm == true)) {
+		torture_assert(tctx,
+			       test_context->packet_count > 0,
+			       "Expected krb5_mk_req_exact to send packets");
+	}
+
+	/*
+	 * Confirm gettting a ticket to pass to the server, running
+	 * the TEST_TGS_REQ_HOST, TEST_TGS_REQ_HOST_SRV_INST, TEST_TGS_REQ_HOST_SRV_HST stage
+	 *
+	 * This triggers the client to attempt to get a
+	 * cross-realm ticket between the alternate names of
+	 * the server, and we need to confirm that behaviour.
+	 *
+	 */
+
+	if (*test_data->krb5_service && *test_data->krb5_hostname) {
+		krb5_principal host_principal_srv_inst;
+		/*
+		 * This tries to guess when the krb5 libs will ask for a
+		 * cross-realm ticket, and when they will just ask the KDC
+		 * directly.
+		 */
+		test_context->test_stage = TEST_TGS_REQ_HOST;
+		test_context->packet_count = 0;
+		torture_assert_int_equal(tctx, krb5_auth_con_init(k5_context, &auth_context),
+					 0, "krb5_auth_con_init failed");
+
+		in_data.length = 0;
+		k5ret = krb5_mk_req(k5_context,
+				    &auth_context,
+				    0,
+				    test_data->krb5_service,
+				    test_data->krb5_hostname,
+				    &in_data, ccache,
+				    &enc_ticket);
+
+		if (test_data->canonicalize == false && test_data->enterprise == false
+		    && (test_data->upper_realm == false || test_data->netbios_realm == true)) {
+			torture_assert_int_equal(tctx, k5ret, KRB5_CC_NOTFOUND,
+						 "krb5_get_creds should have failed with KRB5_CC_NOTFOUND");
+		} else {
+			assertion_message = talloc_asprintf(tctx,
+							    "krb5_mk_req for %s/%s failed: %s",
+							    test_data->krb5_hostname,
+							    test_data->krb5_service,
+							    smb_get_krb5_error_message(k5_context, k5ret, tctx));
+
+			torture_assert_int_equal(tctx, k5ret, 0, assertion_message);
+			/*
+			 * Only in these cases would the above code have needed to
+			 * send packets to the network
+			 */
+			torture_assert(tctx,
+				       test_context->packet_count > 0,
+				       "Expected krb5_get_creds to send packets");
+		}
+
+
+		test_context->test_stage = TEST_TGS_REQ_HOST_SRV_INST;
+		test_context->packet_count = 0;
+
+		torture_assert_int_equal(tctx,
+					 krb5_make_principal(k5_context, &host_principal_srv_inst,
+							     test_data->real_realm,
+							     strupper_talloc(tctx, test_data->krb5_service),
+							     test_data->krb5_hostname,
+							     NULL),
+					 0, "krb5_make_principal failed");
+
+		krb5_principal_set_type(k5_context, host_principal_srv_inst, KRB5_NT_SRV_INST);
+
+		torture_assert_int_equal(tctx, krb5_auth_con_init(k5_context, &auth_context),
+					 0, "krb5_auth_con_init failed");
+
+		in_data.length = 0;
+		k5ret = krb5_mk_req_exact(k5_context,
+					  &auth_context,
+					  0,
+					  host_principal_srv_inst,
+					  &in_data, ccache,
+					  &enc_ticket);
+		krb5_free_principal(k5_context, host_principal_srv_inst);
+		if (test_data->canonicalize == false && test_data->enterprise == false
+		    && (test_data->upper_realm == false || test_data->netbios_realm == true)) {
+			torture_assert_int_equal(tctx, k5ret, KRB5_CC_NOTFOUND,
+						 "krb5_get_creds should have failed with KRB5_CC_NOTFOUND");
+		} else {
+			assertion_message = talloc_asprintf(tctx,
+							    "krb5_mk_req for %s/%s KRB5_NT_SRV_INST failed: %s",
+							    test_data->krb5_service,
+							    test_data->krb5_hostname,
+							    smb_get_krb5_error_message(k5_context, k5ret, tctx));
+
+			torture_assert_int_equal(tctx, k5ret, 0, assertion_message);
+			/*
+			 * Only in these cases would the above code have needed to
+			 * send packets to the network
+			 */
+			torture_assert(tctx,
+				       test_context->packet_count > 0,
+				       "Expected krb5_get_creds to send packets");
+		}
+
+
+		test_context->test_stage = TEST_TGS_REQ_HOST_SRV_HST;
+		test_context->packet_count = 0;
+
+		torture_assert_int_equal(tctx,
+					 krb5_make_principal(k5_context, &host_principal_srv_inst,
+							     test_data->real_realm,
+							     test_data->krb5_service,
+							     strupper_talloc(tctx, test_data->krb5_hostname),
+							     NULL),
+					 0, "krb5_make_principal failed");
+
+		krb5_principal_set_type(k5_context, host_principal_srv_inst, KRB5_NT_SRV_HST);
+
+		torture_assert_int_equal(tctx, krb5_auth_con_init(k5_context, &auth_context),
+					 0, "krb5_auth_con_init failed");
+
+		in_data.length = 0;
+		k5ret = krb5_mk_req_exact(k5_context,
+					  &auth_context,
+					  0,
+					  host_principal_srv_inst,
+					  &in_data, ccache,
+					  &enc_ticket);
+		krb5_free_principal(k5_context, host_principal_srv_inst);
+		if (test_data->canonicalize == false && test_data->enterprise == false
+		    && (test_data->upper_realm == false || test_data->netbios_realm == true)) {
+			torture_assert_int_equal(tctx, k5ret, KRB5_CC_NOTFOUND,
+						 "krb5_get_creds should have failed with KRB5_CC_NOTFOUND");
+		} else {
+			assertion_message = talloc_asprintf(tctx,
+							    "krb5_mk_req for %s/%s KRB5_NT_SRV_INST failed: %s",
+							    test_data->krb5_service,
+							    test_data->krb5_hostname,
+							    smb_get_krb5_error_message(k5_context, k5ret, tctx));
+
+			torture_assert_int_equal(tctx, k5ret, 0, assertion_message);
+			/*
+			 * Only in these cases would the above code have needed to
+			 * send packets to the network
+			 */
+			torture_assert(tctx,
+				       test_context->packet_count > 0,
+				       "Expected krb5_get_creds to send packets");
+		}
+	}
+
+	/*
+	 * Confirm gettting a ticket for the same krbtgt/realm that we
+	 * got back with the initial ticket, running the
+	 * TEST_TGS_REQ_KRBTGT stage.
+	 *
+	 */
+
+	test_context->test_stage = TEST_TGS_REQ_KRBTGT;
+	test_context->packet_count = 0;
+
+	in_data.length = 0;
+	k5ret = krb5_mk_req_exact(k5_context,
+				  &auth_context,
+				  0,
+				  my_creds.server,
+				  &in_data, ccache,
+				  &enc_ticket);
+
+	assertion_message = talloc_asprintf(tctx,
+					    "krb5_mk_req_exact for %s failed: %s",
+					    principal_string,
+					    smb_get_krb5_error_message(k5_context, k5ret, tctx));
+	torture_assert_int_equal(tctx, k5ret, 0, assertion_message);
+
+	/*
+	 * Confirm gettting a ticket for our own principal that we
+	 * got back with the initial ticket, running the
+	 * TEST_AS_REQ_SELF stage.
+	 *
+	 */
+	test_context->test_stage = TEST_AS_REQ_SELF;
+	test_context->packet_count = 0;
+
+	k5ret = krb5_get_init_creds_password(k5_context, &my_creds, principal,
+					     password, NULL, NULL, 0,
+					     principal_string, krb_options);
+
+	if (torture_setting_bool(test_context->tctx, "expect_machine_account", false) && (test_data->upn == false)) {
+		assertion_message = talloc_asprintf(tctx,
+						    "krb5_get_init_creds_password for %s failed: %s",
+						    principal_string,
+						    smb_get_krb5_error_message(k5_context, k5ret, tctx));
+		torture_assert_int_equal(tctx, k5ret, 0, assertion_message);
+		torture_assert(tctx,
+			       test_context->packet_count >= 2,
+			       "Expected krb5_get_init_creds_password to send more packets");
+
+	} else {
+		assertion_message = talloc_asprintf(tctx,
+						    "Got wrong error_code from krb5_get_init_creds_password, expected KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN trying to get a ticket to %s for %s", principal_string, principal_string);
+		torture_assert_int_equal(tctx, k5ret,
+					 KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN,
+					 assertion_message);
+		torture_assert(tctx,
+			       test_context->packet_count >= 1,
+			       "Expected krb5_get_init_creds_password to send more packets");
+
+		/* We can't proceed with more checks */
+		return true;
+	}
+
+	/*
+	 * Assert that the reply was with the correct type of
+	 * principal, depending on the flags we set
+	 */
+	if (test_data->canonicalize == false && test_data->enterprise) {
+		torture_assert_int_equal(tctx,
+					 krb5_principal_get_type(k5_context,
+								 my_creds.client),
+					 KRB5_NT_ENTERPRISE_PRINCIPAL,
+					 "smb_krb5_init_context gave incorrect client->name.name_type");
+		torture_assert_int_equal(tctx,
+					 krb5_principal_get_type(k5_context,
+								 my_creds.server),
+					 KRB5_NT_ENTERPRISE_PRINCIPAL,
+					 "smb_krb5_init_context gave incorrect server->name.name_type");
+	} else {
+		torture_assert_int_equal(tctx,
+					 krb5_principal_get_type(k5_context,
+								 my_creds.client),
+					 KRB5_NT_PRINCIPAL,
+					 "smb_krb5_init_context gave incorrect client->name.name_type");
+		torture_assert_int_equal(tctx,
+					 krb5_principal_get_type(k5_context,
+								 my_creds.server),
+					 KRB5_NT_PRINCIPAL,
+					 "smb_krb5_init_context gave incorrect server->name.name_type");
+	}
+
+	torture_assert_int_equal(tctx,
+				 krb5_unparse_name(k5_context,
+						   my_creds.client, &got_principal_string), 0,
+				 "krb5_unparse_name failed");
+
+	assertion_message = talloc_asprintf(tctx,
+					    "krb5_get_init_creds_password returned a different principal %s to what was expected %s",
+					    got_principal_string, expected_principal_string);
+	krb5_free_unparsed_name(k5_context, got_principal_string);
+
+	torture_assert(tctx, krb5_principal_compare(k5_context,
+						    my_creds.client, expected_principal),
+		       assertion_message);
+
+	torture_assert_int_equal(tctx,
+				 krb5_unparse_name(k5_context,
+						   my_creds.client, &got_principal_string), 0,
+				 "krb5_unparse_name failed");
+
+	assertion_message = talloc_asprintf(tctx,
+					    "krb5_get_init_creds_password returned a different server principal %s to what was expected %s",
+					    got_principal_string, expected_principal_string);
+	krb5_free_unparsed_name(k5_context, got_principal_string);
+
+	torture_assert(tctx, krb5_principal_compare(k5_context,
+						    my_creds.client, expected_principal),
+		       assertion_message);
+
+	krb5_free_principal(k5_context, principal);
+	krb5_get_init_creds_opt_free(k5_context, krb_options);
+
+	torture_assert_int_equal(tctx, krb5_free_cred_contents(k5_context, &my_creds),
+				 0, "krb5_free_cred_contents failed");
+
+	return true;
+}
+
+struct torture_suite *torture_krb5_canon(TALLOC_CTX *mem_ctx)
+{
+	unsigned int i;
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "canon");
+	suite->description = talloc_strdup(suite, "Kerberos Canonicalisation tests");
+
+	for (i = 0; i < TEST_ALL; i++) {
+		char *name = talloc_asprintf(suite, "%s.%s.%s.%s.%s.%s.%s.%s.%s",
+					     (i & TEST_CANONICALIZE) ? "canon" : "no-canon",
+					     (i & TEST_ENTERPRISE) ? "enterprise" : "no-enterprise",
+					     (i & TEST_UPPER_REALM) ? "uc-realm" : "lc-realm",
+					     (i & TEST_UPPER_USERNAME) ? "uc-user" : "lc-user",
+					     (i & TEST_NETBIOS_REALM) ? "netbios-realm" : "krb5-realm",
+					     (i & TEST_WIN2K) ? "win2k" : "no-win2k",
+					     (i & TEST_UPN) ? "upn" : "no-upn",
+					     (i & TEST_S4U2SELF) ? "s4u2self" : "normal",
+					     (i & TEST_REMOVEDOLLAR) ? "removedollar" : "keepdollar");
+
+		struct test_data *test_data = talloc_zero(suite, struct test_data);
+
+		test_data->test_name = name;
+		test_data->real_realm
+			= strupper_talloc(test_data, cli_credentials_get_realm(cmdline_credentials));
+		test_data->real_domain = cli_credentials_get_domain(cmdline_credentials);
+		test_data->username = cli_credentials_get_username(cmdline_credentials);
+		test_data->real_username = cli_credentials_get_username(cmdline_credentials);
+		test_data->canonicalize = (i & TEST_CANONICALIZE) != 0;
+		test_data->enterprise = (i & TEST_ENTERPRISE) != 0;
+		test_data->upper_realm = (i & TEST_UPPER_REALM) != 0;
+		test_data->upper_username = (i & TEST_UPPER_USERNAME) != 0;
+		test_data->netbios_realm = (i & TEST_NETBIOS_REALM) != 0;
+		test_data->win2k = (i & TEST_WIN2K) != 0;
+		test_data->upn = (i & TEST_UPN) != 0;
+		test_data->s4u2self = (i & TEST_S4U2SELF) != 0;
+		test_data->removedollar = (i & TEST_REMOVEDOLLAR) != 0;
+		torture_suite_add_simple_tcase_const(suite, name, torture_krb5_as_req_canon,
+						     test_data);
+
+	}
+	return suite;
+}