2000-04-28 Alexandra Ellwood <lxs@mit.edu>

	* gic_pwd.c (krb5_init_creds_password) added code to return to login library if
	the password is expired (login library handles this error appropriately).

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index b46d85b207b046f4e92f8df359078f242a7abefb..7241e65cb76ebd3b40f814abf35622cd92c5c945 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-28     Alexandra Ellwood       <lxs@mit.edu>
+
+       * gic_pwd.c (krb5_init_creds_password) added code to return to login library if 
+       the password is expired (login library handles this error appropriately).
+
 2000-04-08  Tom Yu  <tlyu@mit.edu>
 
        * vfy_increds.c (krb5_verify_init_creds): appdefault_boolean ->

diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c
index 86a1480ea6f826e7f1b4a5297773d244350a4024..eeb3f03ff2df6a04e628f749f0ef0a273e5e776e 100644 (file)
--- a/src/lib/krb5/krb/gic_pwd.c
+++ b/src/lib/krb5/krb/gic_pwd.c
@@ -174,6 +174,11 @@ krb5_get_init_creds_password(context, creds, client, password, prompter, data,
       ret = ret2;
    }
 
+#ifdef USE_LOGIN_LIBRARY
+       if (ret == KRB5KDC_ERR_KEY_EXP)
+               goto cleanup;   /* Login library will deal appropriately with this error */
+#endif
+
    /* at this point, we have an error from the master.  if the error
       is not password expired, or if it is but there's no prompter,
       return this error */