From 07292e360eb8cad0151ed76edee11a9ce8ca925e Mon Sep 17 00:00:00 2001 From: Alexandra Ellwood Date: Wed, 15 Oct 2008 21:50:26 +0000 Subject: [PATCH] use KIM_BUILTIN_UI instead of LEAN_CLIENT for builtin UI ticket: new git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20875 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kim/lib/kim_ui.c | 36 ++++++++++++++++---------------- src/kim/lib/kim_ui_cli.c | 4 ++-- src/kim/lib/kim_ui_cli_private.h | 4 ++-- src/kim/lib/kim_ui_gui_private.h | 4 ++-- src/kim/lib/mac/kim_os_ui_gui.c | 5 ++--- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/kim/lib/kim_ui.c b/src/kim/lib/kim_ui.c index e52cd9bb2..0bac3d819 100644 --- a/src/kim/lib/kim_ui.c +++ b/src/kim/lib/kim_ui.c @@ -51,15 +51,15 @@ static kim_error kim_ui_init_lazy (kim_ui_context *io_context) if (!err && !io_context) { err = check_error (KIM_NULL_PARAMETER_ERR); } if (!err && !io_context->initialized) { -#ifndef LEAN_CLIENT +#ifdef KIM_BUILTIN_UI kim_ui_environment environment = kim_library_ui_environment (); if (environment == KIM_UI_ENVIRONMENT_GUI) { -#endif /* LEAN_CLIENT */ +#endif /* KIM_BUILTIN_UI */ io_context->type = kim_ui_type_gui_plugin; err = kim_ui_plugin_init (io_context); -#ifndef LEAN_CLIENT +#ifdef KIM_BUILTIN_UI if (err) { io_context->type = kim_ui_type_gui_builtin; @@ -76,7 +76,7 @@ static kim_error kim_ui_init_lazy (kim_ui_context *io_context) err = check_error (KIM_NO_UI_ERR); } -#endif /* LEAN_CLIENT */ +#endif /* KIM_BUILTIN_UI */ if (!err) { io_context->initialized = 1; @@ -133,7 +133,7 @@ kim_error kim_ui_enter_identity (kim_ui_context *in_context, out_identity, out_change_password); -#ifndef LEAN_CLIENT +#ifdef KIM_BUILTIN_UI } else if (in_context->type == kim_ui_type_gui_builtin) { err = kim_os_ui_gui_enter_identity (in_context, io_options, @@ -146,7 +146,7 @@ kim_error kim_ui_enter_identity (kim_ui_context *in_context, out_identity, out_change_password); -#endif /* LEAN_CLIENT */ +#endif /* KIM_BUILTIN_UI */ } else { err = check_error (KIM_NO_UI_ERR); @@ -181,7 +181,7 @@ kim_error kim_ui_select_identity (kim_ui_context *in_context, out_identity, out_change_password); -#ifndef LEAN_CLIENT +#ifdef KIM_BUILTIN_UI } else if (in_context->type == kim_ui_type_gui_builtin) { err = kim_os_ui_gui_select_identity (in_context, io_hints, @@ -194,7 +194,7 @@ kim_error kim_ui_select_identity (kim_ui_context *in_context, out_identity, out_change_password); -#endif /* LEAN_CLIENT */ +#endif /* KIM_BUILTIN_UI */ } else { err = check_error (KIM_NO_UI_ERR); @@ -263,7 +263,7 @@ krb5_error_code kim_ui_prompter (krb5_context in_krb5_context, &reply, &save_reply); -#ifndef LEAN_CLIENT +#ifdef KIM_BUILTIN_UI } else if (context->type == kim_ui_type_gui_builtin) { err = kim_os_ui_gui_auth_prompt (context, context->identity, @@ -287,7 +287,7 @@ krb5_error_code kim_ui_prompter (krb5_context in_krb5_context, in_prompts[i].prompt, &reply, &save_reply); -#endif /* LEAN_CLIENT */ +#endif /* KIM_BUILTIN_UI */ } else { err = check_error (KIM_NO_UI_ERR); @@ -361,7 +361,7 @@ kim_error kim_ui_change_password (kim_ui_context *in_context, out_new_password, out_verify_password); -#ifndef LEAN_CLIENT +#ifdef KIM_BUILTIN_UI } else if (in_context->type == kim_ui_type_gui_builtin) { err = kim_os_ui_gui_change_password (in_context, in_identity, @@ -377,7 +377,7 @@ kim_error kim_ui_change_password (kim_ui_context *in_context, out_old_password, out_new_password, out_verify_password); -#endif /* LEAN_CLIENT */ +#endif /* KIM_BUILTIN_UI */ } else { err = check_error (KIM_NO_UI_ERR); @@ -413,7 +413,7 @@ kim_error kim_ui_handle_error (kim_ui_context *in_context, in_error_message, in_error_description); -#ifndef LEAN_CLIENT +#ifdef KIM_BUILTIN_UI } else if (in_context->type == kim_ui_type_gui_builtin) { err = kim_os_ui_gui_handle_error (in_context, in_identity, @@ -427,7 +427,7 @@ kim_error kim_ui_handle_error (kim_ui_context *in_context, in_error, in_error_message, in_error_description); -#endif /* LEAN_CLIENT */ +#endif /* KIM_BUILTIN_UI */ } else { err = check_error (KIM_NO_UI_ERR); @@ -452,7 +452,7 @@ void kim_ui_free_string (kim_ui_context *in_context, kim_ui_plugin_free_string (in_context, io_string); -#ifndef LEAN_CLIENT +#ifdef KIM_BUILTIN_UI } else if (in_context->type == kim_ui_type_gui_builtin) { kim_os_ui_gui_free_string (in_context, io_string); @@ -460,7 +460,7 @@ void kim_ui_free_string (kim_ui_context *in_context, } else if (in_context->type == kim_ui_type_cli) { kim_ui_cli_free_string (in_context, io_string); -#endif /* LEAN_CLIENT */ +#endif /* KIM_BUILTIN_UI */ } } } @@ -477,13 +477,13 @@ kim_error kim_ui_fini (kim_ui_context *io_context) if (io_context->type == kim_ui_type_gui_plugin) { err = kim_ui_plugin_fini (io_context); -#ifndef LEAN_CLIENT +#ifdef KIM_BUILTIN_UI } else if (io_context->type == kim_ui_type_gui_builtin) { err = kim_os_ui_gui_fini (io_context); } else if (io_context->type == kim_ui_type_cli) { err = kim_ui_cli_fini (io_context); -#endif /* LEAN_CLIENT */ +#endif /* KIM_BUILTIN_UI */ } else { err = check_error (KIM_NO_UI_ERR); diff --git a/src/kim/lib/kim_ui_cli.c b/src/kim/lib/kim_ui_cli.c index a595a3f4d..173a7eb6e 100644 --- a/src/kim/lib/kim_ui_cli.c +++ b/src/kim/lib/kim_ui_cli.c @@ -24,7 +24,7 @@ * or implied warranty. */ -#ifndef LEAN_CLIENT +#ifdef KIM_BUILTIN_UI #include "kim_private.h" @@ -468,4 +468,4 @@ kim_error kim_ui_cli_fini (kim_ui_context *io_context) return KIM_NO_ERROR; } -#endif /* LEAN_CLIENT */ +#endif /* KIM_BUILTIN_UI */ diff --git a/src/kim/lib/kim_ui_cli_private.h b/src/kim/lib/kim_ui_cli_private.h index f11a665b9..26970cf79 100644 --- a/src/kim/lib/kim_ui_cli_private.h +++ b/src/kim/lib/kim_ui_cli_private.h @@ -27,7 +27,7 @@ #ifndef KIM_UI_CLI_PRIVATE_H #define KIM_UI_CLI_PRIVATE_H -#ifndef LEAN_CLIENT +#ifdef KIM_BUILTIN_UI #include @@ -75,6 +75,6 @@ void kim_ui_cli_free_string (kim_ui_context *in_context, kim_error kim_ui_cli_fini (kim_ui_context *in_context); -#endif /* LEAN_CLIENT */ +#endif /* KIM_BUILTIN_UI */ #endif /* KIM_UI_CLI_PRIVATE_H */ diff --git a/src/kim/lib/kim_ui_gui_private.h b/src/kim/lib/kim_ui_gui_private.h index faf4e1596..ecb324339 100644 --- a/src/kim/lib/kim_ui_gui_private.h +++ b/src/kim/lib/kim_ui_gui_private.h @@ -27,7 +27,7 @@ #ifndef KIM_UI_GUI_PRIVATE_H #define KIM_UI_GUI_PRIVATE_H -#ifndef LEAN_CLIENT +#ifdef KIM_BUILTIN_UI #include @@ -75,6 +75,6 @@ void kim_os_ui_gui_free_string (kim_ui_context *in_context, kim_error kim_os_ui_gui_fini (kim_ui_context *in_context); -#endif /* LEAN_CLIENT */ +#endif /* KIM_BUILTIN_UI */ #endif /* KIM_UI_GUI_PRIVATE_H */ diff --git a/src/kim/lib/mac/kim_os_ui_gui.c b/src/kim/lib/mac/kim_os_ui_gui.c index 0b8096fcb..6e1c5cef1 100644 --- a/src/kim/lib/mac/kim_os_ui_gui.c +++ b/src/kim/lib/mac/kim_os_ui_gui.c @@ -24,13 +24,12 @@ * or implied warranty. */ -#ifndef LEAN_CLIENT +#ifdef KIM_BUILTIN_UI #include "kim_os_private.h" #include "k5_mig_client.h" -#include #include #include #include @@ -561,4 +560,4 @@ kim_error kim_os_ui_gui_fini (kim_ui_context *io_context) return check_error (err); } -#endif /* LEAN_CLIENT */ +#endif /* KIM_BUILTIN_UI */ -- 2.26.2