From: Tom Yu Date: Tue, 12 Dec 2006 23:37:53 +0000 (+0000) Subject: pull up r18932 from trunk X-Git-Tag: krb5-1.6-beta2~27 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea70c96a7921973eaa52686b76e7dfad1a46fba1;p=krb5.git pull up r18932 from trunk r18932@cathode-dark-space: jaltman | 2006-12-07 19:28:59 -0500 ticket: new subject: build the trunk on Windows (again) This revision corrects a number of missing or extraneous KRB5_CALLCONV symbols; exposes symbols for _WIN32; and avoids including headers that don't exist ticket: 5022 version_fixed: 1.6 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@18945 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 3f93efd8a..8e589a62e 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -1734,7 +1734,7 @@ krb5_error_code KRB5_CALLCONV krb5_cc_retrieve_cred_default (krb5_context, krb5_ccache, krb5_flags, krb5_creds *, krb5_creds *); -krb5_boolean +krb5_boolean KRB5_CALLCONV krb5_creds_compare (krb5_context in_context, krb5_creds *in_creds, krb5_creds *in_compare_creds); diff --git a/src/include/kdb.h b/src/include/kdb.h index 9f1fedbf2..e8a58787c 100644 --- a/src/include/kdb.h +++ b/src/include/kdb.h @@ -84,8 +84,6 @@ #define KRB5_KDB_CREATE_BTREE 0x00000001 #define KRB5_KDB_CREATE_HASH 0x00000002 -#if !defined(_WIN32) - /* * Note --- these structures cannot be modified without changing the * database version number in libkdb.a, but should be expandable by @@ -499,6 +497,4 @@ krb5_db_free_policy( krb5_context kcontext, #define KRB5_KDB_DEF_FLAGS 0 -#endif /* !defined(_WIN32) */ - #endif /* KRB5_KDB5__ */ diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 80baf41ce..c12bd5b4b 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -764,7 +764,7 @@ krb5_libdefault_boolean(krb5_context context, const krb5_data *realm, /* Sort a pa_data sequence so that types named in the "preferred_preauth_types" * libdefaults entry are listed before any others. */ -static krb5_error_code KRB5_CALLCONV +static krb5_error_code sort_krb5_padata_sequence(krb5_context context, krb5_data *realm, krb5_pa_data **padata) { diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index ad924b73b..b80fd50fa 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -97,7 +97,7 @@ krb5_init_secure_context(krb5_context *context) return init_common (context, TRUE, FALSE); } -krb5_error_code KRB5_CALLCONV +krb5_error_code krb5int_init_context_kdc(krb5_context *context) { return init_common (context, FALSE, TRUE); diff --git a/src/lib/krb5/krb/preauth2.c b/src/lib/krb5/krb/preauth2.c index 7c103bb4d..fc1bc71da 100644 --- a/src/lib/krb5/krb/preauth2.c +++ b/src/lib/krb5/krb/preauth2.c @@ -33,7 +33,9 @@ #include "osconf.h" #include +#if !defined(_WIN32) #include +#endif #if TARGET_OS_MAC static const char *objdirs[] = { KRB5_PLUGIN_BUNDLE_DIR, LIBDIR "/krb5/plugins/preauth", NULL }; /* should be a list */ @@ -64,7 +66,7 @@ typedef struct _pa_types_t { * credentials should never hit this routine), breaking up the module's * list of support pa_types so that we can iterate over the modules more * easily, and copying over the relevant parts of the module's table. */ -void +void KRB5_CALLCONV krb5_init_preauth_context(krb5_context kcontext) { int n_modules, n_tables, i, j, k; @@ -198,7 +200,7 @@ krb5_init_preauth_context(krb5_context kcontext) /* Zero the use counts for the modules herein. Usually used before we * start processing any data from the server, at which point every module * will again be able to take a crack at whatever the server sent. */ -void +void KRB5_CALLCONV krb5_clear_preauth_context_use_counts(krb5_context context) { int i; @@ -212,7 +214,7 @@ krb5_clear_preauth_context_use_counts(krb5_context context) /* Free the per-krb5_context preauth_context. This means clearing any * plugin-specific context which may have been created, and then * freeing the context itself. */ -void +void KRB5_CALLCONV krb5_free_preauth_context(krb5_context context) { int i; @@ -237,7 +239,7 @@ krb5_free_preauth_context(krb5_context context) /* Initialize the per-AS-REQ context. This means calling the client_req_init * function to give the plugin a chance to allocate a per-request context. */ -void +void KRB5_CALLCONV krb5_preauth_request_context_init(krb5_context context) { int i; @@ -259,7 +261,7 @@ krb5_preauth_request_context_init(krb5_context context) /* Free the per-AS-REQ context. This means clearing any request-specific * context which the plugin may have created. */ -void +void KRB5_CALLCONV krb5_preauth_request_context_fini(krb5_context context) { int i; @@ -401,7 +403,7 @@ client_data_proc(krb5_context kcontext, /* Tweak the request body, for now adding any enctypes which the module claims * to add support for to the list, but in the future perhaps doing more * involved things. */ -void +void KRB5_CALLCONV krb5_preauth_prepare_request(krb5_context kcontext, krb5_get_init_creds_opt *options, krb5_kdc_req *request) @@ -1284,7 +1286,7 @@ static const pa_types_t pa_types[] = { * err_reply, return 0. If it's the sort of correction which requires that we * ask the user another question, we let the calling application deal with it. */ -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_do_preauth_tryagain(krb5_context kcontext, krb5_kdc_req *request, krb5_data *encoded_request_body, @@ -1349,7 +1351,7 @@ krb5_do_preauth_tryagain(krb5_context kcontext, return ret; } -krb5_error_code +krb5_error_code KRB5_CALLCONV krb5_do_preauth(krb5_context context, krb5_kdc_req *request, krb5_data *encoded_request_body,