summaryrefslogtreecommitdiff
path: root/source4/heimdal
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-11-11 14:00:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:25:26 -0500
commitd822b963f9c178f3f2278be717ac97fbcb8de01c (patch)
treefda66a0f3ce32e62a74094ce12441d85b36dd42b /source4/heimdal
parent3ba2a9dfcf71b55e8bfe481395015ad666b4e12c (diff)
downloadsamba-d822b963f9c178f3f2278be717ac97fbcb8de01c.tar.gz
samba-d822b963f9c178f3f2278be717ac97fbcb8de01c.tar.bz2
samba-d822b963f9c178f3f2278be717ac97fbcb8de01c.zip
r19663: merge changes from lorikeet heimdal:
support for netbios domain based realms metze (This used to be commit dcec6eebf1b474ae3055449efebf491b1106a458)
Diffstat (limited to 'source4/heimdal')
-rw-r--r--source4/heimdal/lib/krb5/get_in_tkt.c74
1 files changed, 52 insertions, 22 deletions
diff --git a/source4/heimdal/lib/krb5/get_in_tkt.c b/source4/heimdal/lib/krb5/get_in_tkt.c
index ebc96f2279..e140011413 100644
--- a/source4/heimdal/lib/krb5/get_in_tkt.c
+++ b/source4/heimdal/lib/krb5/get_in_tkt.c
@@ -131,12 +131,21 @@ _krb5_extract_ticket(krb5_context context,
krb5_const_pointer decryptarg)
{
krb5_error_code ret;
- krb5_principal tmp_principal;
+ krb5_principal tmp_principal, srv_principal = NULL;
int tmp;
size_t len;
time_t tmp_time;
krb5_timestamp sec_now;
+/*
+ * HACK:
+ * this is really a ugly hack, to support using the Netbios Domain Name
+ * as realm against windows KDC's, they always return the full realm
+ * based on the DNS Name.
+ */
+allow_server_mismatch = 1;
+ignore_cname = 1;
+
ret = _krb5_principalname2krb5_principal (context,
&tmp_principal,
rep->kdc_rep.cname,
@@ -168,44 +177,63 @@ _krb5_extract_ticket(krb5_context context,
krb5_abortx(context, "internal error in ASN.1 encoder");
creds->second_ticket.length = 0;
creds->second_ticket.data = NULL;
+
+ /* decrypt */
+
+ if (decrypt_proc == NULL)
+ decrypt_proc = decrypt_tkt;
+
+ ret = (*decrypt_proc)(context, key, key_usage, decryptarg, rep);
+ if (ret)
+ goto out;
+
+#if 0
+ /* XXX should this decode be here, or in the decrypt_proc? */
+ ret = krb5_decode_keyblock(context, &rep->enc_part.key, 1);
+ if(ret)
+ goto out;
+#endif
/* compare server */
ret = _krb5_principalname2krb5_principal (context,
- &tmp_principal,
+ &srv_principal,
rep->kdc_rep.ticket.sname,
rep->kdc_rep.ticket.realm);
if (ret)
goto out;
+
+ ret = _krb5_principalname2krb5_principal (context,
+ &tmp_principal,
+ rep->enc_part.sname,
+ rep->enc_part.srealm);
+ if (ret)
+ goto out;
+
+ /*
+ * see if the service principal matches in the ticket
+ * and in the enc_part
+ */
+ tmp = krb5_principal_compare (context, tmp_principal, srv_principal);
+ krb5_free_principal (context, tmp_principal);
+ if (!tmp) {
+ ret = KRB5KRB_AP_ERR_MODIFIED;
+ krb5_clear_error_string (context);
+ goto out;
+ }
+
if(allow_server_mismatch){
krb5_free_principal(context, creds->server);
- creds->server = tmp_principal;
- tmp_principal = NULL;
+ creds->server = srv_principal;
+ srv_principal = NULL;
}else{
- tmp = krb5_principal_compare (context, tmp_principal, creds->server);
- krb5_free_principal (context, tmp_principal);
+ tmp = krb5_principal_compare (context, srv_principal, creds->server);
if (!tmp) {
ret = KRB5KRB_AP_ERR_MODIFIED;
krb5_clear_error_string (context);
goto out;
}
}
-
- /* decrypt */
-
- if (decrypt_proc == NULL)
- decrypt_proc = decrypt_tkt;
-
- ret = (*decrypt_proc)(context, key, key_usage, decryptarg, rep);
- if (ret)
- goto out;
-
-#if 0
- /* XXX should this decode be here, or in the decrypt_proc? */
- ret = krb5_decode_keyblock(context, &rep->enc_part.key, 1);
- if(ret)
- goto out;
-#endif
/* compare nonces */
@@ -301,6 +329,8 @@ _krb5_extract_ticket(krb5_context context,
out:
memset (rep->enc_part.key.keyvalue.data, 0,
rep->enc_part.key.keyvalue.length);
+ if (srv_principal)
+ krb5_free_principal (context, srv_principal);
return ret;
}