From: Ken Raeburn Date: Wed, 1 Sep 1999 20:59:34 +0000 (+0000) Subject: From 1.1 branch. X-Git-Tag: krb5-1.2-beta1~264 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=20551b3739f17bd7b4f4ec27f79b2445ed6ff12d;p=krb5.git From 1.1 branch. Indented krb5_cc macros for readability, plus: 1999-08-31 Jeffrey Altman * k5-int.h: Add #define ANSI_STDIO for Windows builds so that stdio opens files in binary mode instead of text mode. This is necessary for Ctrl-Z transparency. 1999-08-30 Ken Raeburn * configure.in: Check for memmove and bcopy. * Makefile.in (install): Install profile.h since krb5.h will use it. 1999-08-26 Danilo Almeida * krb5.hin (krb5_kuserok): Fix calling convention to make it consistent with rest of krb5 exports before we start exporting this from the Windows DLL. 1999-08-25 Danilo Almeida * k5-int.h (krb5_cc_retrieve_cred_default): Fix calling convention to make it consistent with actual calling convention. 1999-08-23 Ken Raeburn * krb5.hin (KRB5_TC_SUPPORTED_KTYPES): New flag. * k5-int.h (krb5_cc_retrieve_cred_default): Declare. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11764 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 2d00ac727..017cd8e27 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,32 @@ +1999-08-31 Jeffrey Altman + + * k5-int.h: Add #define ANSI_STDIO for Windows builds so that + stdio opens files in binary mode instead of text + mode. This is necessary for Ctrl-Z transparency. + +1999-08-30 Ken Raeburn + + * configure.in: Check for memmove and bcopy. + + * Makefile.in (install): Install profile.h since krb5.h will use + it. + +1999-08-26 Danilo Almeida + + * krb5.hin (krb5_kuserok): Fix calling convention to make it + consistent with rest of krb5 exports before we start exporting + this from the Windows DLL. + +1999-08-25 Danilo Almeida + + * k5-int.h (krb5_cc_retrieve_cred_default): Fix calling convention + to make it consistent with actual calling convention. + +1999-08-23 Ken Raeburn + + * krb5.hin (KRB5_TC_SUPPORTED_KTYPES): New flag. + * k5-int.h (krb5_cc_retrieve_cred_default): Declare. + 1999-08-18 Tom Yu * krb5.hin: Re-align des3-cbc-sha1 and hmac-sha1-des3 to agree diff --git a/src/include/Makefile.in b/src/include/Makefile.in index db023fc69..5298a4b32 100644 --- a/src/include/Makefile.in +++ b/src/include/Makefile.in @@ -69,5 +69,6 @@ clean-windows:: cd .. @echo Making clean in include -install:: krb5.h +install:: krb5.h profile.h $(INSTALL_DATA) krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5.h + $(INSTALL_DATA) profile.h $(DESTDIR)$(KRB5_INCDIR)$(S)profile.h diff --git a/src/include/configure.in b/src/include/configure.in index 8a4c03d15..c99448ecf 100644 --- a/src/include/configure.in +++ b/src/include/configure.in @@ -5,7 +5,7 @@ AC_PROG_INSTALL AC_PROG_AWK AC_PROG_LEX AC_CONST -AC_CHECK_FUNCS(strdup labs setvbuf) +AC_CHECK_FUNCS(strdup labs setvbuf memmove bcopy) HAVE_YYLINENO CHECK_DIRENT AC_TYPE_UID_T diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 709d86631..cf25de11d 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -102,6 +102,7 @@ #define INI_KRB_CCACHE "krb5cc" /* Location of the ccache */ #define INI_KRB5_CONF "krb5.ini" /* Location of krb5.conf file */ #define HAVE_LABS +#define ANSI_STDIO #endif @@ -1474,6 +1475,11 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_ser_unpack_bytes krb5_octet FAR * FAR *, size_t FAR *)); + +krb5_error_code KRB5_CALLCONV krb5_cc_retrieve_cred_default + KRB5_PROTOTYPE((krb5_context, krb5_ccache, krb5_flags, + krb5_creds *, krb5_creds *)); + #if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) #pragma import reset #endif diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 8ec3cea6c..45348b3df 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -1168,24 +1168,25 @@ typedef struct _krb5_cc_ops { #define KRB5_TC_MATCH_SRV_NAMEONLY 0x00000040 #define KRB5_TC_MATCH_2ND_TKT 0x00000080 #define KRB5_TC_MATCH_KTYPE 0x00000100 +#define KRB5_TC_SUPPORTED_KTYPES 0x00000200 /* for set_flags and other functions */ #define KRB5_TC_OPENCLOSE 0x00000001 -#define krb5_cc_initialize(context, cache, principal) krb5_x((cache)->ops->init,(context, cache, principal)) -#define krb5_cc_gen_new(context, cache) krb5_x((*cache)->ops->gen_new,(context, cache)) -#define krb5_cc_destroy(context, cache) krb5_x((cache)->ops->destroy,(context, cache)) -#define krb5_cc_close(context, cache) krb5_x((cache)->ops->close,(context, cache)) -#define krb5_cc_store_cred(context, cache, creds) krb5_x((cache)->ops->store,(context, cache, creds)) -#define krb5_cc_retrieve_cred(context, cache, flags, mcreds, creds) krb5_x((cache)->ops->retrieve,(context, cache, flags, mcreds, creds)) -#define krb5_cc_get_principal(context, cache, principal) krb5_x((cache)->ops->get_princ,(context, cache, principal)) -#define krb5_cc_start_seq_get(context, cache, cursor) krb5_x((cache)->ops->get_first,(context, cache, cursor)) -#define krb5_cc_next_cred(context, cache, cursor, creds) krb5_x((cache)->ops->get_next,(context, cache, cursor, creds)) -#define krb5_cc_end_seq_get(context, cache, cursor) krb5_x((cache)->ops->end_get,(context, cache, cursor)) -#define krb5_cc_remove_cred(context, cache, flags, creds) krb5_x((cache)->ops->remove_cred,(context, cache,flags, creds)) -#define krb5_cc_set_flags(context, cache, flags) krb5_x((cache)->ops->set_flags,(context, cache, flags)) -#define krb5_cc_get_name(context, cache) krb5_xc((cache)->ops->get_name,(context, cache)) -#define krb5_cc_get_type(context, cache) ((cache)->ops->prefix) +#define krb5_cc_initialize(context, cache, principal) krb5_x ((cache)->ops->init,(context, cache, principal)) +#define krb5_cc_gen_new(context, cache) krb5_x ((*cache)->ops->gen_new,(context, cache)) +#define krb5_cc_destroy(context, cache) krb5_x ((cache)->ops->destroy,(context, cache)) +#define krb5_cc_close(context, cache) krb5_x ((cache)->ops->close,(context, cache)) +#define krb5_cc_store_cred(context, cache, creds) krb5_x ((cache)->ops->store,(context, cache, creds)) +#define krb5_cc_retrieve_cred(context, cache, flags, mcreds, creds) krb5_x ((cache)->ops->retrieve,(context, cache, flags, mcreds, creds)) +#define krb5_cc_get_principal(context, cache, principal) krb5_x ((cache)->ops->get_princ,(context, cache, principal)) +#define krb5_cc_start_seq_get(context, cache, cursor) krb5_x ((cache)->ops->get_first,(context, cache, cursor)) +#define krb5_cc_next_cred(context, cache, cursor, creds) krb5_x ((cache)->ops->get_next,(context, cache, cursor, creds)) +#define krb5_cc_end_seq_get(context, cache, cursor) krb5_x ((cache)->ops->end_get,(context, cache, cursor)) +#define krb5_cc_remove_cred(context, cache, flags, creds) krb5_x ((cache)->ops->remove_cred,(context, cache,flags, creds)) +#define krb5_cc_set_flags(context, cache, flags) krb5_x ((cache)->ops->set_flags,(context, cache, flags)) +#define krb5_cc_get_name(context, cache) krb5_xc((cache)->ops->get_name,(context, cache)) +#define krb5_cc_get_type(context, cache) ((cache)->ops->prefix) extern krb5_cc_ops *krb5_cc_dfl_ops; @@ -2153,7 +2154,7 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_get_realm_domain KRB5_PROTOTYPE((krb5_context, const char *, char ** )); -krb5_boolean krb5_kuserok +KRB5_DLLIMP krb5_boolean KRB5_CALLCONV krb5_kuserok KRB5_PROTOTYPE((krb5_context, krb5_principal, const char *)); KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_auth_con_genaddrs