From 5112116a84fd6f3a6798879b970f93e117e0996a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Sun, 11 Jan 2009 21:44:58 +0000 Subject: [PATCH] Allow inctx to be NULL. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24258 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/rd_req.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/krb5/rd_req.c b/lib/krb5/rd_req.c index bf96013f3..713893eaf 100644 --- a/lib/krb5/rd_req.c +++ b/lib/krb5/rd_req.c @@ -857,7 +857,7 @@ krb5_rd_req_ctx(krb5_context context, &o->keyblock); if (ret) goto out; - } else if(inctx->keyblock){ + } else if(inctx && inctx->keyblock){ ret = krb5_copy_keyblock(context, inctx->keyblock, &o->keyblock); @@ -897,9 +897,9 @@ krb5_rd_req_ctx(krb5_context context, goto out; } else { - krb5_keytab id = NULL; - krb5_kt_cursor cursor; krb5_keytab_entry entry; + krb5_kt_cursor cursor; + krb5_keytab id = NULL; int done = 0, kvno = 0; memset(&cursor, 0, sizeof(cursor)); @@ -992,7 +992,7 @@ krb5_rd_req_ctx(krb5_context context, /* If there is a PAC, verify its server signature */ - if (inctx->check_pac) { + if (inctx == NULL || inctx->check_pac) { krb5_pac pac; krb5_data data;