summaryrefslogtreecommitdiff
path: root/source4/heimdal/lib/krb5/rd_req.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-08-15 21:16:40 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-08-15 21:16:40 +1000
commit489525a6390e50bd0442295ac45164f43a7576c8 (patch)
tree44a8715d7359c2efcc482f87bea82dd92bd080de /source4/heimdal/lib/krb5/rd_req.c
parentcd261ee651d3059f6973464115ff43da71d8a595 (diff)
parent4bdb752cc51c9f41859f1a43bf5721ae616fa230 (diff)
downloadsamba-489525a6390e50bd0442295ac45164f43a7576c8.tar.gz
samba-489525a6390e50bd0442295ac45164f43a7576c8.tar.bz2
samba-489525a6390e50bd0442295ac45164f43a7576c8.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit fa03d750e4577a610dc410d45d49789110b1b4f1)
Diffstat (limited to 'source4/heimdal/lib/krb5/rd_req.c')
-rw-r--r--source4/heimdal/lib/krb5/rd_req.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/source4/heimdal/lib/krb5/rd_req.c b/source4/heimdal/lib/krb5/rd_req.c
index e80aaa6789..ddf1f69ae4 100644
--- a/source4/heimdal/lib/krb5/rd_req.c
+++ b/source4/heimdal/lib/krb5/rd_req.c
@@ -463,8 +463,6 @@ krb5_verify_ap_req2(krb5_context context,
ac->keytype = ETYPE_NULL;
-#if 0
-/* it's bad to use a different enctype as the client */
if (etypes.val) {
int i;
@@ -475,7 +473,6 @@ krb5_verify_ap_req2(krb5_context context,
}
}
}
-#endif
/* save key */
ret = krb5_copy_keyblock(context, &t->ticket.key, &ac->keyblock);