summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Coffman <kwc@citi.umich.edu>2006-12-11 17:04:26 +0000
committerKevin Coffman <kwc@citi.umich.edu>2006-12-11 17:04:26 +0000
commit28a13180bf96e973a166aae42a3e89d878f8d386 (patch)
treebe373429c4e3ad51de99793145ba22cc8f9f34b3
parentfe2a14e0a81b62e4eb6a4600650908e7f1ae5bd5 (diff)
downloadkrb5-coffman/gic_opt_ext.tar.gz
Move prototypes for get_init_creds_opt_get_pa() andcoffman/gic_opt_ext
krb5_get_init_creds_opt_free_pa() into the preauth_plugin.h header rather than krb5.hin. git-svn-id: svn://anonsvn.mit.edu/krb5/users/coffman/gic_opt_ext@18936 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/include/krb5/krb5.hin25
-rw-r--r--src/include/krb5/preauth_plugin.h29
2 files changed, 28 insertions, 26 deletions
diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index 420978237..21cea4623 100644
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -2509,31 +2509,6 @@ krb5_get_init_creds_opt_set_pa
const char *attr,
const char *value);
-/*
- * This function allows a preauth plugin to obtain preauth
- * options. The preauth_data returned from this function
- * should be freed by calling krb5_get_init_creds_opt_free_pa().
- *
- * The 'opt' pointer supplied to this function must have been
- * obtained using krb5_get_init_creds_opt_alloc()
- */
-krb5_error_code KRB5_CALLCONV
-krb5_get_init_creds_opt_get_pa
- (krb5_context context,
- krb5_get_init_creds_opt *opt,
- int *num_preauth_data,
- krb5_gic_opt_pa_data **preauth_data);
-
-/*
- * This function frees the preauth_data that was returned by
- * krb5_get_init_creds_opt_get_pa().
- */
-void KRB5_CALLCONV
-krb5_get_init_creds_opt_free_pa
- (krb5_context context,
- int num_preauth_data,
- krb5_gic_opt_pa_data *preauth_data);
-
krb5_error_code KRB5_CALLCONV
krb5_get_init_creds_password
(krb5_context context,
diff --git a/src/include/krb5/preauth_plugin.h b/src/include/krb5/preauth_plugin.h
index 194e53199..7243a00b1 100644
--- a/src/include/krb5/preauth_plugin.h
+++ b/src/include/krb5/preauth_plugin.h
@@ -239,7 +239,7 @@ typedef struct krb5plugin_preauth_client_ftable_v0 {
krb5_error_code (*tryagain)(krb5_context context,
void *plugin_context,
void *request_context,
- krb5_get_init_creds_opt *opt,
+ krb5_get_init_creds_opt *opt,
preauth_get_client_data_proc get_data_proc,
struct _krb5_preauth_client_rock *rock,
krb5_kdc_req *request,
@@ -342,4 +342,31 @@ typedef struct krb5plugin_preauth_server_ftable_v0 {
void *pa_module_context,
void **request_pa_context);
} krb5plugin_preauth_server_ftable_v0;
+
+
+/*
+ * This function allows a preauth plugin to obtain preauth
+ * options. The preauth_data returned from this function
+ * should be freed by calling krb5_get_init_creds_opt_free_pa().
+ *
+ * The 'opt' pointer supplied to this function must have been
+ * obtained using krb5_get_init_creds_opt_alloc()
+ */
+krb5_error_code KRB5_CALLCONV
+krb5_get_init_creds_opt_get_pa
+ (krb5_context context,
+ krb5_get_init_creds_opt *opt,
+ int *num_preauth_data,
+ krb5_gic_opt_pa_data **preauth_data);
+
+/*
+ * This function frees the preauth_data that was returned by
+ * krb5_get_init_creds_opt_get_pa().
+ */
+void KRB5_CALLCONV
+krb5_get_init_creds_opt_free_pa
+ (krb5_context context,
+ int num_preauth_data,
+ krb5_gic_opt_pa_data *preauth_data);
+
#endif /* KRB5_PREAUTH_PLUGIN_H_INCLUDED */