Allow inctx to be NULL.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24258 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -857,7 +857,7 @@ krb5_rd_req_ctx(krb5_context context,
|
|||||||
&o->keyblock);
|
&o->keyblock);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
} else if(inctx->keyblock){
|
} else if(inctx && inctx->keyblock){
|
||||||
ret = krb5_copy_keyblock(context,
|
ret = krb5_copy_keyblock(context,
|
||||||
inctx->keyblock,
|
inctx->keyblock,
|
||||||
&o->keyblock);
|
&o->keyblock);
|
||||||
@@ -897,9 +897,9 @@ krb5_rd_req_ctx(krb5_context context,
|
|||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
krb5_keytab id = NULL;
|
|
||||||
krb5_kt_cursor cursor;
|
|
||||||
krb5_keytab_entry entry;
|
krb5_keytab_entry entry;
|
||||||
|
krb5_kt_cursor cursor;
|
||||||
|
krb5_keytab id = NULL;
|
||||||
int done = 0, kvno = 0;
|
int done = 0, kvno = 0;
|
||||||
|
|
||||||
memset(&cursor, 0, sizeof(cursor));
|
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 there is a PAC, verify its server signature */
|
||||||
if (inctx->check_pac) {
|
if (inctx == NULL || inctx->check_pac) {
|
||||||
krb5_pac pac;
|
krb5_pac pac;
|
||||||
krb5_data data;
|
krb5_data data;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user