diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/krb5/ChangeLog | 8 | ||||
| -rw-r--r-- | src/include/krb5/base-defs.h | 16 | ||||
| -rw-r--r-- | src/include/krb5/func-proto.h | 68 | ||||
| -rw-r--r-- | src/include/krb5/los-proto.h | 11 |
4 files changed, 54 insertions, 49 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index fd6533dea..bdafb01f6 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,11 @@ +Wed Apr 5 16:41:41 1995 Keith Vetter (keithv@fusion.com) + + * los-proto.h, func-proto.h: moved krb5_us_timeofday and + krb5_sname_to_principal from the former to the latter. + * base-def.h: added FAR to pointer types for the PC. + * func-proto.h: added FAR to pointer types in prototypes but + only for functions which are exported. + Fri Mar 31 19:34:47 1995 Keith Vetter (keithv@fusion.com) * k5-config.h: defined dup to _dup for STDC stuff on Windows diff --git a/src/include/krb5/base-defs.h b/src/include/krb5/base-defs.h index 77fc54179..2929c7cab 100644 --- a/src/include/krb5/base-defs.h +++ b/src/include/krb5/base-defs.h @@ -57,7 +57,7 @@ typedef krb5_error_code krb5_magic; typedef struct _krb5_data { krb5_magic magic; int length; - char *data; + char FAR *data; } krb5_data; /* make const & volatile available without effect */ @@ -70,11 +70,11 @@ typedef struct _krb5_data { #endif #if defined(__STDC__) || defined(HAS_VOID_TYPE) -typedef void * krb5_pointer; -typedef void const * krb5_const_pointer; +typedef void FAR * krb5_pointer; +typedef void const FAR * krb5_const_pointer; #else -typedef char * krb5_pointer; -typedef char const * krb5_const_pointer; +typedef char FAR * krb5_pointer; +typedef char const FAR * krb5_const_pointer; #endif #if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) @@ -98,12 +98,12 @@ typedef char const * krb5_const_pointer; typedef struct krb5_principal_data { krb5_magic magic; krb5_data realm; - krb5_data *data; /* An array of strings */ + krb5_data FAR *data; /* An array of strings */ krb5_int32 length; krb5_int32 type; } krb5_principal_data; -typedef krb5_principal_data *krb5_principal; +typedef krb5_principal_data FAR * krb5_principal; /* * Per V5 spec on definition of principal types @@ -123,7 +123,7 @@ typedef krb5_principal_data *krb5_principal; #define KRB5_NT_UID 5 /* constant version thereof: */ -typedef const krb5_principal_data *krb5_const_principal; +typedef const krb5_principal_data FAR *krb5_const_principal; #define krb5_princ_realm(context, princ) (&(princ)->realm) #define krb5_princ_set_realm(context, princ,value) ((princ)->realm = *(value)) diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h index a28e9d126..ce1c9280b 100644 --- a/src/include/krb5/func-proto.h +++ b/src/include/krb5/func-proto.h @@ -28,7 +28,7 @@ #define KRB5_FUNC_PROTO__ krb5_error_code INTERFACE krb5_init_context - PROTOTYPE((krb5_context *)); + PROTOTYPE((krb5_context FAR *)); void INTERFACE krb5_free_context PROTOTYPE((krb5_context)); @@ -80,8 +80,8 @@ krb5_error_code INTERFACE krb5_get_credentials PROTOTYPE((krb5_context, const krb5_flags, krb5_ccache, - krb5_creds *, - krb5_creds **)); + krb5_creds FAR *, + krb5_creds FAR * FAR *)); krb5_error_code INTERFACE krb5_get_for_creds PROTOTYPE((krb5_context, const krb5_cksumtype, @@ -101,20 +101,20 @@ krb5_error_code INTERFACE krb5_mk_req krb5_data * )); krb5_error_code INTERFACE krb5_mk_req_extended PROTOTYPE((krb5_context, - krb5_auth_context **, + krb5_auth_context FAR * FAR *, const krb5_flags, - krb5_data *, - krb5_creds *, - krb5_data * )); + krb5_data FAR *, + krb5_creds FAR *, + krb5_data FAR * )); krb5_error_code INTERFACE krb5_mk_rep PROTOTYPE((krb5_context, krb5_auth_context *, krb5_data *)); krb5_error_code INTERFACE krb5_rd_rep PROTOTYPE((krb5_context, - krb5_auth_context *, - const krb5_data *, - krb5_ap_rep_enc_part **)); + krb5_auth_context FAR *, + const krb5_data FAR *, + krb5_ap_rep_enc_part FAR * FAR *)); krb5_error_code INTERFACE krb5_mk_error PROTOTYPE((krb5_context, const krb5_error *, @@ -137,12 +137,12 @@ krb5_error_code INTERFACE krb5_rd_priv krb5_replay_data *)); krb5_error_code INTERFACE krb5_parse_name PROTOTYPE((krb5_context, - const char *, - krb5_principal * )); + const char FAR *, + krb5_principal FAR * )); krb5_error_code INTERFACE krb5_unparse_name PROTOTYPE((krb5_context, krb5_const_principal, - char ** )); + char FAR * FAR * )); krb5_error_code INTERFACE krb5_unparse_name_ext PROTOTYPE((krb5_context, krb5_const_principal, @@ -222,7 +222,7 @@ krb5_error_code INTERFACE krb5_get_server_rcache PROTOTYPE((krb5_context, const krb5_data *, krb5_rcache *)); krb5_error_code INTERFACE_C krb5_build_principal_ext - STDARG_P((krb5_context, krb5_principal *, int, const char *, ...)); + STDARG_P((krb5_context, krb5_principal FAR *, int, const char FAR *, ...)); krb5_error_code INTERFACE_C krb5_build_principal STDARG_P((krb5_context, krb5_principal *, int, const char *, ...)); #ifdef va_start @@ -298,7 +298,7 @@ char * INTERFACE krb5_cc_default_name PROTOTYPE((krb5_context)); krb5_error_code INTERFACE krb5_cc_default PROTOTYPE((krb5_context, - krb5_ccache *)); + krb5_ccache FAR *)); unsigned int INTERFACE krb5_get_notification_message PROTOTYPE((void)); @@ -324,7 +324,7 @@ void INTERFACE krb5_free_authenticator_contents krb5_authenticator * )); void INTERFACE krb5_free_addresses PROTOTYPE((krb5_context, - krb5_address ** )); + krb5_address FAR * FAR * )); void INTERFACE krb5_free_address PROTOTYPE((krb5_context, krb5_address * )); @@ -378,10 +378,10 @@ void INTERFACE krb5_free_cred krb5_cred *)); void INTERFACE krb5_free_creds PROTOTYPE((krb5_context, - krb5_creds *)); + krb5_creds FAR *)); void INTERFACE krb5_free_cred_contents PROTOTYPE((krb5_context, - krb5_creds *)); + krb5_creds FAR *)); void INTERFACE krb5_free_cred_enc_part PROTOTYPE((krb5_context, krb5_cred_enc_part *)); @@ -396,7 +396,7 @@ void INTERFACE krb5_free_pa_data krb5_pa_data **)); void INTERFACE krb5_free_ap_rep_enc_part PROTOTYPE((krb5_context, - krb5_ap_rep_enc_part *)); + krb5_ap_rep_enc_part FAR *)); void INTERFACE krb5_free_tkt_authent PROTOTYPE((krb5_context, krb5_tkt_authent *)); @@ -408,15 +408,25 @@ void INTERFACE krb5_free_pwd_sequences passwd_phrase_element **)); /* From krb5/os but needed but by the outside world */ +krb5_error_code INTERFACE krb5_us_timeofday + PROTOTYPE((krb5_context, + krb5_int32 FAR *, + krb5_int32 FAR * )); krb5_error_code INTERFACE krb5_timeofday PROTOTYPE((krb5_context, - krb5_int32 * )); + krb5_int32 FAR * )); /* get all the addresses of this host */ krb5_error_code INTERFACE krb5_os_localaddr - PROTOTYPE((krb5_address ***)); + PROTOTYPE((krb5_address FAR * FAR * FAR *)); krb5_error_code INTERFACE krb5_get_default_realm PROTOTYPE((krb5_context, - char ** )); + char FAR * FAR * )); +krb5_error_code INTERFACE krb5_sname_to_principal + PROTOTYPE((krb5_context, + const char FAR *, + const char FAR *, + krb5_int32, + krb5_principal FAR *)); /* Only put things which don't have pointers to the narrow types in this section */ @@ -468,13 +478,13 @@ krb5_error_code INTERFACE krb5_get_in_tkt krb5_error_code INTERFACE krb5_get_in_tkt_with_password PROTOTYPE((krb5_context, const krb5_flags, - krb5_address * const *, - krb5_enctype *, - krb5_preauthtype *, - const char *, + krb5_address FAR * const FAR *, + krb5_enctype FAR *, + krb5_preauthtype FAR *, + const char FAR *, krb5_ccache, - krb5_creds *, - krb5_kdc_rep ** )); + krb5_creds FAR *, + krb5_kdc_rep FAR * FAR * )); krb5_error_code INTERFACE krb5_get_in_tkt_with_skey PROTOTYPE((krb5_context, @@ -679,8 +689,6 @@ krb5_error_code INTERFACE krb5_auth_con_getremotesubkey krb5_auth_context *, krb5_keyblock **)); - - #define KRB5_REALM_BRANCH_CHAR '.' #endif /* KRB5_FUNC_PROTO__ */ diff --git a/src/include/krb5/los-proto.h b/src/include/krb5/los-proto.h index f66170e8f..202f6a140 100644 --- a/src/include/krb5/los-proto.h +++ b/src/include/krb5/los-proto.h @@ -50,10 +50,6 @@ krb5_error_code INTERFACE krb5_unlock_file PROTOTYPE((krb5_context, FILE *, char * )); -krb5_error_code INTERFACE krb5_us_timeofday - PROTOTYPE((krb5_context, - krb5_int32 *, - krb5_int32 * )); int INTERFACE krb5_net_read PROTOTYPE((krb5_context, int , @@ -125,13 +121,6 @@ krb5_error_code INTERFACE krb5_write_message krb5_pointer, krb5_data *)); -krb5_error_code INTERFACE krb5_sname_to_principal - PROTOTYPE((krb5_context, - const char *, - const char *, - krb5_int32, - krb5_principal *)); - krb5_error_code INTERFACE krb5_os_init_context PROTOTYPE((krb5_context)); |
