From ec749034fa482811f960fbb822bdd59c0b64f4e6 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Sun, 24 May 2009 22:51:08 +0000 Subject: [PATCH] pull up r22360 from trunk ------------------------------------------------------------------------ r22360 | ghudson | 2009-05-22 16:08:25 +0200 (Fri, 22 May 2009) | 10 lines ticket: 6492 subject: Remove spurious assertion in handle_authdata tags: pullup target_version: 1.7 In handle_authdata in the KDC, remove a spurious assertion (added in r21566 on the mskrb-integ branch) that authdata starts out empty. authdata can be legitimately added by check_padata, which precedes handle_authdata, and this happens with pkinit. ticket: 6492 version_fixed: 1.7 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22375 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kdc/kdc_authdata.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/kdc/kdc_authdata.c b/src/kdc/kdc_authdata.c index fd2e3ab5b..8575caf5b 100644 --- a/src/kdc/kdc_authdata.c +++ b/src/kdc/kdc_authdata.c @@ -574,7 +574,6 @@ handle_authdata (krb5_context context, krb5_error_code code = 0; int i; - assert(enc_tkt_reply->authorization_data == NULL); for (i = 0; i < n_authdata_systems; i++) { const krb5_authdata_systems *asys = &authdata_systems[i]; -- 2.26.2