r10066: This is the second in my patches to work on Samba4's kerberos support,

with an aim to make the code simpiler and more correct.

Gone is the old (since the very early Samba 3.0 krb5 days) 'iterate over
all keytypes)' code in gensec_krb5, we now follow the approach used in
gensec_gssapi, and use a keytab.

I have also done a lot of work in the GSSAPI code, to try and reduce
the diff between us and upstream heimdal.  It was becoming hard to
track patches in this code, and I also want this patch (the DCE_STYLE
support) to be in a 'manageable' state for when lha considers it for
merging.  (metze assures me it still has memory leak problems, but
I've started to address some of that).

This patch also includes a simple update of other code to current
heimdal, as well as changes we need for better PAC verification.

On the PAC side of things we now match windows member servers by
checking the name and authtime on an incoming PAC.  Not generating these
right was the cause of the PAC pain, and so now both the main code and
torture test validate this behaviour.

One thing doesn't work with this patch:
 - the sealing of RPC pipes with kerberos, Samba -> Samba seems
broken.  I'm pretty sure this is related to AES, and the need to break
apart the gss_wrap interface.

Andrew Bartlett
(This used to be commit a3aba57c00a9c5318f4706db55d03f64e8bea60c)

1 files changed, 3 insertions, 8 deletions

diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index 45b6776f70..20578a786e 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -36,7 +36,7 @@
 	krb5_error_code ret;
 	NTSTATUS nt_status;
 	struct auth_serversupplied_info *server_info;
-	char *username, *p;
+	char *username;
 	const char *realm;
 	DATA_BLOB tmp_blob;
 	TALLOC_CTX *mem_ctx = talloc_named(config, 0, "samba_get_pac context");
@@ -44,7 +44,7 @@
 		return ENOMEM;
 	}
 
-	ret = krb5_unparse_name(context, client, &username);
+	ret = krb5_unparse_name_norealm(context, client, &username);
 
 	if (ret != 0) {
 		krb5_set_error_string(context, "get pac: could not parse principal");
@@ -55,12 +55,6 @@
 
 	/* parse the principal name */
 	realm = krb5_principal_get_realm(context, client);
-	username = talloc_strdup(mem_ctx, username);
-	p = strchr(username, '@');
-	if (p) {
-		p[0] = '\0';
-	}
-
 
 	nt_status = sam_get_server_info(mem_ctx, username, realm, 
 					data_blob(NULL, 0), data_blob(NULL, 0),
@@ -75,6 +69,7 @@
 				  context, 
 				  krbtgt_keyblock,
 				  server_keyblock,
+				  client,
 				  tgs_authtime,
 				  &tmp_blob);