summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandra Ellwood <lxs@mit.edu>2000-04-28 21:06:46 +0000
committerAlexandra Ellwood <lxs@mit.edu>2000-04-28 21:06:46 +0000
commitc6385f27159595b7ef7b564d3f6d37cfb4a5c84f (patch)
tree10aae438e00382f65418cdf80191e6fb9a6b679a
parente098362c116e3ca82fe3751302a056348cc2ba91 (diff)
downloadkrb5-c6385f27159595b7ef7b564d3f6d37cfb4a5c84f.tar.gz
krb5-c6385f27159595b7ef7b564d3f6d37cfb4a5c84f.tar.xz
krb5-c6385f27159595b7ef7b564d3f6d37cfb4a5c84f.zip
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
-rw-r--r--src/lib/krb5/krb/ChangeLog5
-rw-r--r--src/lib/krb5/krb/gic_pwd.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index b46d85b20..7241e65cb 100644
--- 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 86a1480ea..eeb3f03ff 100644
--- 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 */