pull up r18931 from trunk

 r18931@cathode-dark-space:  jaltman | 2006-12-07 17:13:50 -0500
 ticket: 3642

 	Undo revision 18930 which was not supposed to include this
         file.

ticket: 3642

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@18968 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/gic_opt.c b/src/lib/krb5/krb/gic_opt.c
index 963bbc2788e989f875b29e0f894d2a7dd35e15be..58d07b03db538d6002bc2a4b69f7aa9c989dc7f6 100644 (file)
--- a/src/lib/krb5/krb/gic_opt.c
+++ b/src/lib/krb5/krb/gic_opt.c
@@ -3,7 +3,7 @@
 void KRB5_CALLCONV
 krb5_get_init_creds_opt_init(krb5_get_init_creds_opt *opt)
 {
-   opt->flags = KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT;
+   opt->flags = 0;
 }
 
 void KRB5_CALLCONV
@@ -63,13 +63,3 @@ krb5_get_init_creds_opt_set_salt(krb5_get_init_creds_opt *opt, krb5_data *salt)
    opt->flags |= KRB5_GET_INIT_CREDS_OPT_SALT;
    opt->salt = salt;
 }
-
-void KRB5_CALLCONV
-krb5_get_init_creds_opt_set_salt(krb5_get_init_creds_opt *opt, int prompt)
-{
-   if (prompt)
-     opt->flags |= KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT;
-   else
-     opt->flags &= ~KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT;
-}
-