From: Sam Hartman <hartmans@mit.edu>
Date: Mon, 4 Jan 2010 19:59:20 +0000 (+0000)
Subject: Other changes in this ticket guarantee that the padata argument to
X-Git-Tag: krb5-1.8-alpha1~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4c2630eb315e962261c4f02e629c18e288c69060;p=krb5.git

Other changes in this ticket guarantee that the padata argument to
return callbacks is non-null; don't check for null in pkinit_srv.c.

ticket: 6607

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23582 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/plugins/preauth/pkinit/pkinit_srv.c b/src/plugins/preauth/pkinit/pkinit_srv.c
index ecd49b59f..719b01c80 100644
--- a/src/plugins/preauth/pkinit/pkinit_srv.c
+++ b/src/plugins/preauth/pkinit/pkinit_srv.c
@@ -704,7 +704,7 @@ pkinit_server_return_padata(krb5_context context,
         return return_pkinit_kx(context, request, reply,
                                 encrypting_key, send_pa);
     }
-    if (padata == NULL || padata->length <= 0 || padata->contents == NULL)
+    if (padata->length <= 0 || padata->contents == NULL)
         return 0;
 
     if (pa_request_context == NULL || *pa_request_context == NULL) {