From faf1d49929ff39c32e50ceabdce69bbebfc23652 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Tue, 23 Mar 2010 01:58:07 +0000 Subject: [PATCH] pull up r23815 from trunk ------------------------------------------------------------------------ r23815 | ghudson | 2010-03-17 14:10:10 -0700 (Wed, 17 Mar 2010) | 7 lines ticket: 6681 target_version: 1.8.1 tags: pullup When checking for KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT, don't dereference options if it's NULL. ticket: 6681 version_fixed: 1.8.1 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@23825 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/krb/gic_pwd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c index cadd7ad35..7b437272f 100644 --- a/src/lib/krb5/krb/gic_pwd.c +++ b/src/lib/krb5/krb/gic_pwd.c @@ -218,7 +218,7 @@ krb5_get_init_creds_password(krb5_context context, * to prompt. Prompting is only disabled if the option has been set * and the value has been set to false. */ - if (!(options->flags & KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT)) + if (options && !(options->flags & KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT)) goto cleanup; /* ok, we have an expired password. Give the user a few chances -- 2.26.2