From: Tom Yu Date: Fri, 17 Nov 2006 23:48:35 +0000 (+0000) Subject: pull up r18842 from trunk X-Git-Tag: kfw-3.1.0-beta4^2~3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f25faaf25358f50674c116fbbdc4b113c8dc7c72;p=krb5.git pull up r18842 from trunk r18842@cathode-dark-space: jaltman | 2006-11-17 18:41:40 -0500 ticket: 4802 krb5_get_init_creds_password: remove unintentionally committed code not meant for 1.4 branch ticket: 4802 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@18844 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c index f9b135766..40288b9ed 100644 --- a/src/lib/krb5/krb/gic_pwd.c +++ b/src/lib/krb5/krb/gic_pwd.c @@ -184,14 +184,6 @@ krb5_get_init_creds_password(krb5_context context, krb5_creds *creds, krb5_princ (prompter == NULL)) goto cleanup; - /* historically the default has been to prompt for password change. - * if the change password prompt option has not been set, we continue - * 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)) - goto cleanup; - /* ok, we have an expired password. Give the user a few chances to change it */