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-6@18850 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c
index f9b135766fff9beaea6db3cffc51a90daf8c22d7..40288b9ed50a1577af897ae939baf3ba6da28c21 100644 (file)
--- 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 */