Add krb5_get_prompt_types() functionality

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

8 files changed, 57 insertions, 2 deletions

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index bbc0f8e59..b5abe94b8 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-15  Danilo Almeida  <dalmeida@mit.edu>
+
+	* krb5_32.def: Add krb5_get_prompt_types.
+
 2000-02-01  Danilo Almeida  <dalmeida@mit.edu>
 
 	* krb5_32.def: Replace decode_krb5_ticket with krb5_decode_ticket.
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 97265206f..59d8765aa 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-15  Danilo Almeida  <dalmeida@mit.edu>
+
+	* init_ctx.c (init_common), gic_pwd.c (krb5_get_as_key_password,
+	krb5_get_init_creds_password), preauth2.c (pa_sam): Add support
+	for krb5_get_prompt_types().
+
 2000-03-13  Ken Raeburn  <raeburn@mit.edu>
 
 	* preauth2.c (pa_function): Called function now takes new
diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c
index c2ee423cc..7ca43430e 100644
--- a/src/lib/krb5/krb/gic_pwd.c
+++ b/src/lib/krb5/krb/gic_pwd.c
@@ -19,6 +19,7 @@ krb5_get_as_key_password(context, client, etype, prompter, prompter_data,
     char *clientstr;
     char promptstr[1024];
     krb5_prompt prompt;
+    krb5_prompt_type prompt_type;
 
     password = (krb5_data *) gak_data;
 
@@ -53,10 +54,16 @@ krb5_get_as_key_password(context, client, etype, prompter, prompter_data,
 	prompt.prompt = promptstr;
 	prompt.hidden = 1;
 	prompt.reply = password;
+	prompt_type = KRB5_PROMPT_TYPE_PASSWORD;
 
+	/* PROMPTER_INVOCATION */
+	krb5int_set_prompt_types(context, &prompt_type);
 	if (ret = (((*prompter)(context, prompter_data, NULL, NULL,
-				1, &prompt))))
+				1, &prompt)))) {
+	    krb5int_set_prompt_types(context, 0);
 	    return(ret);
+	}
+	krb5int_set_prompt_types(context, 0);
     }
 
     if ((salt->length == -1) && (salt->data == NULL)) {
@@ -98,6 +105,7 @@ krb5_get_init_creds_password(context, creds, client, password, prompter, data,
    krb5_data pw0, pw1;
    char banner[1024], pw0array[1024], pw1array[1024];
    krb5_prompt prompt[2];
+   krb5_prompt_type prompt_types[sizeof(prompt)/sizeof(prompt[0])];
 
    master = 0;
    as_reply = NULL;
@@ -193,10 +201,12 @@ krb5_get_init_creds_password(context, creds, client, password, prompter, data,
    prompt[0].prompt = "Enter new password";
    prompt[0].hidden = 1;
    prompt[0].reply = &pw0;
+   prompt_types[0] = KRB5_PROMPT_TYPE_NEW_PASSWORD;
 
    prompt[1].prompt = "Enter it again";
    prompt[1].hidden = 1;
    prompt[1].reply = &pw1;
+   prompt_types[1] = KRB5_PROMPT_TYPE_NEW_PASSWORD_AGAIN;
 
    strcpy(banner, "Password expired.  You must change it now.");
 
@@ -204,9 +214,13 @@ krb5_get_init_creds_password(context, creds, client, password, prompter, data,
       pw0.length = sizeof(pw0array);
       pw1.length = sizeof(pw1array);
 
+      /* PROMPTER_INVOCATION */
+      krb5int_set_prompt_types(context, prompt_types);
       if (ret = ((*prompter)(context, data, 0, banner,
 			     sizeof(prompt)/sizeof(prompt[0]), prompt)))
 	 goto cleanup;
+      krb5int_set_prompt_types(context, 0);
+
 
       if (strcmp(pw0.data, pw1.data) != 0) {
 	 ret = KRB5_LIBOS_BADPWDMATCH;
@@ -271,6 +285,7 @@ krb5_get_init_creds_password(context, creds, client, password, prompter, data,
 			     &master, &as_reply);
 
 cleanup:
+   krb5int_set_prompt_types(context, 0);
    /* if getting the password was successful, then check to see if the
       password is about to expire, and warn if so */
 
@@ -300,6 +315,7 @@ cleanup:
 		    hours/24);
 
 	 /* ignore an error here */
+         /* PROMPTER_INVOCATION */
 	 (*prompter)(context, data, 0, banner, 0, 0);
       }
    }
diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index 9159a3717..e2eccc402 100644
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -196,7 +196,7 @@ init_common (context, secure)
 			    0, DEFAULT_CCACHE_TYPE, &tmp);
 	ctx->fcc_default_format = tmp + 0x0500;
 	ctx->scc_default_format = tmp + 0x0500;
-
+	ctx->prompt_types = 0;
 	*context = ctx;
 	return 0;
 
diff --git a/src/lib/krb5/krb/preauth2.c b/src/lib/krb5/krb/preauth2.c
index ec80c6520..5ea61c9dc 100644
--- a/src/lib/krb5/krb/preauth2.c
+++ b/src/lib/krb5/krb/preauth2.c
@@ -247,6 +247,7 @@ krb5_error_code pa_sam(krb5_context context,
     char			prompt[100], response[100];
     krb5_data			response_data;
     krb5_prompt			kprompt;
+    krb5_prompt_type		prompt_type;
     krb5_data			defsalt;
     krb5_sam_challenge		*sam_challenge = 0;
     krb5_sam_response		sam_response;
@@ -287,12 +288,17 @@ krb5_error_code pa_sam(krb5_context context,
     kprompt.prompt = prompt;
     kprompt.hidden = sam_challenge->sam_challenge.length?0:1;
     kprompt.reply = &response_data;
+    prompt_type = KRB5_PROMPT_TYPE_PREAUTH;
 
+    /* PROMPTER_INVOCATION */
+    krb5int_set_prompt_types(context, &prompt_type);
     if (ret = ((*prompter)(context, prompter_data, name,
 			   banner, 1, &kprompt))) {
 	krb5_xfree(sam_challenge);
+	krb5int_set_prompt_types(context, 0);
 	return(ret);
     }
+    krb5int_set_prompt_types(context, 0);
 
     enc_sam_response_enc.sam_nonce = sam_challenge->sam_nonce;
     if (sam_challenge->sam_nonce == 0) {
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index ded442bda..8f8c01821 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-15  Danilo Almeida  <dalmeida@mit.edu>
+
+	* prompter.c: Add krb5int_set_prompt_types() and
+	krb5_get_prompt_types().
+
 2000-03-14  Ken Raeburn  <raeburn@mit.edu>
 
 	* init_os_ctx.c (os_get_default_config_files): Remove unused
diff --git a/src/lib/krb5/os/prompter.c b/src/lib/krb5/os/prompter.c
index 800377f78..933ff2cea 100644
--- a/src/lib/krb5/os/prompter.c
+++ b/src/lib/krb5/os/prompter.c
@@ -229,3 +229,20 @@ krb5_prompter_posix(krb5_context context,
 }
 #endif /* !_WIN32 */
 #endif /* !MSDOS */
+
+void
+krb5int_set_prompt_types(context, types)
+    krb5_context context;
+    krb5_prompt_type *types;
+{
+    context->prompt_types = 0;
+}
+
+KRB5_DLLIMP
+krb5_prompt_type*
+KRB5_CALLCONV
+krb5_get_prompt_types(context)
+    krb5_context context;
+{
+    return context->prompt_types;
+}
diff --git a/src/lib/krb5_32.def b/src/lib/krb5_32.def
index df5209df0..4c5f271b2 100644
--- a/src/lib/krb5_32.def
+++ b/src/lib/krb5_32.def
@@ -110,6 +110,7 @@ EXPORTS
 	krb5_parse_name
 	krb5_principal_compare
 	krb5_prompter_posix
+	krb5_get_prompt_types
 	krb5_rd_cred
 	krb5_rd_error
 	krb5_rd_priv