svn rev #23825: branches/krb5-1-8/src/lib/krb5/krb/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23825
Commit By: tlyu
Log Message:
ticket: 6681
version_fixed: 1.8.1
status: resolved

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.


Changed Files:
U   branches/krb5-1-8/src/lib/krb5/krb/gic_pwd.c
Modified: branches/krb5-1-8/src/lib/krb5/krb/gic_pwd.c
===================================================================
--- branches/krb5-1-8/src/lib/krb5/krb/gic_pwd.c	2010-03-23 01:58:00 UTC (rev 23824)
+++ branches/krb5-1-8/src/lib/krb5/krb/gic_pwd.c	2010-03-23 01:58:07 UTC (rev 23825)
@@ -218,7 +218,7 @@
      * 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