diff options
Diffstat (limited to 'src/lib/krb5')
173 files changed, 652 insertions, 603 deletions
diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog index 8daaad5..4a0494b 100644 --- a/src/lib/krb5/asn.1/ChangeLog +++ b/src/lib/krb5/asn.1/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + Wed Mar 22 09:39:55 1995 <tytso@rsx-11.mit.edu> * asn1_k_decode.c (setup, next_tag, apptag, get_field_body, diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c index c12e3a5..54a14df 100644 --- a/src/lib/krb5/asn.1/asn1_decode.c +++ b/src/lib/krb5/asn.1/asn1_decode.c @@ -52,7 +52,7 @@ return 0 time_t gmt_mktime PROTOTYPE((struct tm *)); -asn1_error_code INTERFACE asn1_decode_integer(buf, val) +asn1_error_code asn1_decode_integer(buf, val) asn1buf * buf; long * val; { @@ -71,7 +71,7 @@ asn1_error_code INTERFACE asn1_decode_integer(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_unsigned_integer(buf, val) +asn1_error_code asn1_decode_unsigned_integer(buf, val) asn1buf * buf; unsigned long * val; { @@ -90,7 +90,7 @@ asn1_error_code INTERFACE asn1_decode_unsigned_integer(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_octetstring(buf, retlen, val) +asn1_error_code asn1_decode_octetstring(buf, retlen, val) asn1buf * buf; int * retlen; asn1_octet ** val; @@ -103,7 +103,7 @@ asn1_error_code INTERFACE asn1_decode_octetstring(buf, retlen, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_charstring(buf, retlen, val) +asn1_error_code asn1_decode_charstring(buf, retlen, val) asn1buf * buf; int * retlen; char ** val; @@ -117,7 +117,7 @@ asn1_error_code INTERFACE asn1_decode_charstring(buf, retlen, val) } -asn1_error_code INTERFACE asn1_decode_generalstring(buf, retlen, val) +asn1_error_code asn1_decode_generalstring(buf, retlen, val) asn1buf * buf; int * retlen; char ** val; @@ -131,7 +131,7 @@ asn1_error_code INTERFACE asn1_decode_generalstring(buf, retlen, val) } -asn1_error_code INTERFACE asn1_decode_null(buf) +asn1_error_code asn1_decode_null(buf) asn1buf * buf; { setup(); @@ -140,7 +140,7 @@ asn1_error_code INTERFACE asn1_decode_null(buf) cleanup(); } -asn1_error_code INTERFACE asn1_decode_printablestring(buf, retlen, val) +asn1_error_code asn1_decode_printablestring(buf, retlen, val) asn1buf * buf; int * retlen; char ** val; @@ -153,7 +153,7 @@ asn1_error_code INTERFACE asn1_decode_printablestring(buf, retlen, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_ia5string(buf, retlen, val) +asn1_error_code asn1_decode_ia5string(buf, retlen, val) asn1buf * buf; int * retlen; char ** val; @@ -166,7 +166,7 @@ asn1_error_code INTERFACE asn1_decode_ia5string(buf, retlen, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_generaltime(buf, val) +asn1_error_code asn1_decode_generaltime(buf, val) asn1buf * buf; time_t * val; { diff --git a/src/lib/krb5/asn.1/asn1_decode.h b/src/lib/krb5/asn.1/asn1_decode.h index 2d8f074..39bc6ba 100644 --- a/src/lib/krb5/asn.1/asn1_decode.h +++ b/src/lib/krb5/asn.1/asn1_decode.h @@ -55,18 +55,18 @@ Returns ENOMEM if memory is exhausted. Returns asn1 errors. */ -asn1_error_code INTERFACE asn1_decode_integer +asn1_error_code asn1_decode_integer PROTOTYPE((asn1buf *buf, long *val)); -asn1_error_code INTERFACE asn1_decode_unsigned_integer +asn1_error_code asn1_decode_unsigned_integer PROTOTYPE((asn1buf *buf, unsigned long *val)); -asn1_error_code INTERFACE asn1_decode_null +asn1_error_code asn1_decode_null PROTOTYPE((asn1buf *buf)); -asn1_error_code INTERFACE asn1_decode_octetstring +asn1_error_code asn1_decode_octetstring PROTOTYPE((asn1buf *buf, int *retlen, asn1_octet **val)); -asn1_error_code INTERFACE asn1_decode_generalstring +asn1_error_code asn1_decode_generalstring PROTOTYPE((asn1buf *buf, int *retlen, char **val)); -asn1_error_code INTERFACE asn1_decode_charstring +asn1_error_code asn1_decode_charstring PROTOTYPE((asn1buf *buf, int *retlen, char **val)); /* Note: A charstring is a special hack to account for the fact that krb5 structures store some OCTET STRING values in krb5_octet @@ -74,12 +74,12 @@ asn1_error_code INTERFACE asn1_decode_charstring PROTOTYPE((which use char arrays). From the ASN.1 point of view, the two string types are the same, only the receptacles differ. */ -asn1_error_code INTERFACE asn1_decode_printablestring +asn1_error_code asn1_decode_printablestring PROTOTYPE((asn1buf *buf, int *retlen, char **val)); -asn1_error_code INTERFACE asn1_decode_ia5string +asn1_error_code asn1_decode_ia5string PROTOTYPE((asn1buf *buf, int *retlen, char **val)); -asn1_error_code INTERFACE asn1_decode_generaltime +asn1_error_code asn1_decode_generaltime PROTOTYPE((asn1buf *buf, time_t *val)); #endif diff --git a/src/lib/krb5/asn.1/asn1_encode.c b/src/lib/krb5/asn.1/asn1_encode.c index a91520b..d26d95d 100644 --- a/src/lib/krb5/asn.1/asn1_encode.c +++ b/src/lib/krb5/asn.1/asn1_encode.c @@ -26,7 +26,7 @@ #include "asn1_encode.h" #include "asn1_make.h" -asn1_error_code INTERFACE asn1_encode_integer(buf, val, retlen) +asn1_error_code asn1_encode_integer(buf, val, retlen) asn1buf * buf; const long val; int * retlen; @@ -63,7 +63,7 @@ asn1_error_code INTERFACE asn1_encode_integer(buf, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_unsigned_integer(buf, val, retlen) +asn1_error_code asn1_encode_unsigned_integer(buf, val, retlen) asn1buf * buf; const unsigned long val; int * retlen; @@ -96,7 +96,7 @@ asn1_error_code INTERFACE asn1_encode_unsigned_integer(buf, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_octetstring(buf, len, val, retlen) +asn1_error_code asn1_encode_octetstring(buf, len, val, retlen) asn1buf * buf; const int len; const asn1_octet * val; @@ -114,7 +114,7 @@ asn1_error_code INTERFACE asn1_encode_octetstring(buf, len, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_charstring(buf, len, val, retlen) +asn1_error_code asn1_encode_charstring(buf, len, val, retlen) asn1buf * buf; const int len; const char * val; @@ -132,7 +132,7 @@ asn1_error_code INTERFACE asn1_encode_charstring(buf, len, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_null(buf, retlen) +asn1_error_code asn1_encode_null(buf, retlen) asn1buf * buf; int * retlen; { @@ -147,7 +147,7 @@ asn1_error_code INTERFACE asn1_encode_null(buf, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_printablestring(buf, len, val, retlen) +asn1_error_code asn1_encode_printablestring(buf, len, val, retlen) asn1buf * buf; const int len; const char * val; @@ -165,7 +165,7 @@ asn1_error_code INTERFACE asn1_encode_printablestring(buf, len, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_ia5string(buf, len, val, retlen) +asn1_error_code asn1_encode_ia5string(buf, len, val, retlen) asn1buf * buf; const int len; const char * val; @@ -183,7 +183,7 @@ asn1_error_code INTERFACE asn1_encode_ia5string(buf, len, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_generaltime(buf, val, retlen) +asn1_error_code asn1_encode_generaltime(buf, val, retlen) asn1buf * buf; const time_t val; int * retlen; @@ -210,7 +210,7 @@ asn1_error_code INTERFACE asn1_encode_generaltime(buf, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_generalstring(buf, len, val, retlen) +asn1_error_code asn1_encode_generalstring(buf, len, val, retlen) asn1buf * buf; const int len; const char * val; diff --git a/src/lib/krb5/asn.1/asn1_encode.h b/src/lib/krb5/asn.1/asn1_encode.h index f5d8036..c8995b5 100644 --- a/src/lib/krb5/asn.1/asn1_encode.h +++ b/src/lib/krb5/asn.1/asn1_encode.h @@ -46,7 +46,7 @@ asn1_encode_generalstring */ -asn1_error_code INTERFACE asn1_encode_integer +asn1_error_code asn1_encode_integer PROTOTYPE((asn1buf *buf, const long val, int *retlen)); /* requires *buf is allocated modifies *buf, *retlen @@ -55,7 +55,7 @@ asn1_error_code INTERFACE asn1_encode_integer Returns ENOMEM to signal an unsuccesful attempt to expand the buffer. */ -asn1_error_code INTERFACE asn1_encode_unsigned_integer +asn1_error_code asn1_encode_unsigned_integer PROTOTYPE((asn1buf *buf, const unsigned long val, int *retlen)); /* requires *buf is allocated modifies *buf, *retlen @@ -64,7 +64,7 @@ asn1_error_code INTERFACE asn1_encode_unsigned_integer Returns ENOMEM to signal an unsuccesful attempt to expand the buffer. */ -asn1_error_code INTERFACE asn1_encode_octetstring +asn1_error_code asn1_encode_octetstring PROTOTYPE((asn1buf *buf, const int len, const asn1_octet *val, int *retlen)); @@ -75,7 +75,7 @@ asn1_error_code INTERFACE asn1_encode_octetstring Returns ENOMEM to signal an unsuccesful attempt to expand the buffer. */ -asn1_error_code INTERFACE asn1_encode_charstring +asn1_error_code asn1_encode_charstring PROTOTYPE((asn1buf *buf, const int len, const char *val, int *retlen)); @@ -86,7 +86,7 @@ asn1_error_code INTERFACE asn1_encode_charstring Returns ENOMEM to signal an unsuccesful attempt to expand the buffer. */ -asn1_error_code INTERFACE asn1_encode_null +asn1_error_code asn1_encode_null PROTOTYPE((asn1buf *buf, int *retlen)); /* requires *buf is allocated modifies *buf, *retlen @@ -95,7 +95,7 @@ asn1_error_code INTERFACE asn1_encode_null Returns ENOMEM to signal an unsuccesful attempt to expand the buffer. */ -asn1_error_code INTERFACE asn1_encode_printablestring +asn1_error_code asn1_encode_printablestring PROTOTYPE((asn1buf *buf, const int len, const char *val, int *retlen)); @@ -106,7 +106,7 @@ asn1_error_code INTERFACE asn1_encode_printablestring Returns ENOMEM to signal an unsuccesful attempt to expand the buffer. */ -asn1_error_code INTERFACE asn1_encode_ia5string +asn1_error_code asn1_encode_ia5string PROTOTYPE((asn1buf *buf, const int len, const char *val, int *retlen)); @@ -117,7 +117,7 @@ asn1_error_code INTERFACE asn1_encode_ia5string Returns ENOMEM to signal an unsuccesful attempt to expand the buffer. */ -asn1_error_code INTERFACE asn1_encode_generaltime +asn1_error_code asn1_encode_generaltime PROTOTYPE((asn1buf *buf, const time_t val, int *retlen)); /* requires *buf is allocated modifies *buf, *retlen @@ -127,7 +127,7 @@ asn1_error_code INTERFACE asn1_encode_generaltime to expand the buffer. Note: The encoding of GeneralizedTime is YYYYMMDDhhmmZ */ -asn1_error_code INTERFACE asn1_encode_generalstring +asn1_error_code asn1_encode_generalstring PROTOTYPE((asn1buf *buf, const int len, const char *val, int *retlen)); diff --git a/src/lib/krb5/asn.1/asn1_get.c b/src/lib/krb5/asn.1/asn1_get.c index 3a7e33d..602a25e 100644 --- a/src/lib/krb5/asn.1/asn1_get.c +++ b/src/lib/krb5/asn.1/asn1_get.c @@ -23,7 +23,7 @@ #include "asn1_get.h" -asn1_error_code INTERFACE asn1_get_tag(buf, class, construction, tagnum, retlen) +asn1_error_code asn1_get_tag(buf, class, construction, tagnum, retlen) asn1buf * buf; asn1_class * class; asn1_construction * construction; @@ -44,7 +44,7 @@ asn1_error_code INTERFACE asn1_get_tag(buf, class, construction, tagnum, retlen) return 0; } -asn1_error_code INTERFACE asn1_get_sequence(buf, retlen) +asn1_error_code asn1_get_sequence(buf, retlen) asn1buf * buf; int * retlen; { @@ -64,7 +64,7 @@ asn1_error_code INTERFACE asn1_get_sequence(buf, retlen) /****************************************************************/ /* Private Procedures */ -asn1_error_code INTERFACE asn1_get_id(buf, class, construction, tagnum) +asn1_error_code asn1_get_id(buf, class, construction, tagnum) asn1buf * buf; asn1_class * class; asn1_construction * construction; @@ -100,7 +100,7 @@ asn1_error_code INTERFACE asn1_get_id(buf, class, construction, tagnum) return 0; } -asn1_error_code INTERFACE asn1_get_length(buf, retlen) +asn1_error_code asn1_get_length(buf, retlen) asn1buf * buf; int * retlen; { diff --git a/src/lib/krb5/asn.1/asn1_get.h b/src/lib/krb5/asn.1/asn1_get.h index ac7103d..67bc719 100644 --- a/src/lib/krb5/asn.1/asn1_get.h +++ b/src/lib/krb5/asn.1/asn1_get.h @@ -30,7 +30,7 @@ #include "krbasn1.h" #include "asn1buf.h" -asn1_error_code INTERFACE asn1_get_tag +asn1_error_code asn1_get_tag PROTOTYPE((asn1buf *buf, asn1_class *class, asn1_construction *construction, @@ -45,7 +45,7 @@ asn1_error_code INTERFACE asn1_get_tag *tagnum is set to ASN1_TAGNUM_CEILING. Returns ASN1_OVERRUN if *buf is exhausted during the parse. */ -asn1_error_code INTERFACE asn1_get_sequence +asn1_error_code asn1_get_sequence PROTOTYPE((asn1buf *buf, int *retlen)); /* requires *buf is allocated effects Decodes a tag from *buf and returns ASN1_BAD_ID if it @@ -55,7 +55,7 @@ asn1_error_code INTERFACE asn1_get_sequence /****************************************************************/ /* Private Procedures */ -asn1_error_code INTERFACE asn1_get_id +asn1_error_code asn1_get_id PROTOTYPE((asn1buf *buf, asn1_class *class, asn1_construction *construction, @@ -67,7 +67,7 @@ asn1_error_code INTERFACE asn1_get_id are returned in *construction and *tagnum, respectively. Returns ASN1_OVERRUN if *buf is exhausted. */ -asn1_error_code INTERFACE asn1_get_length +asn1_error_code asn1_get_length PROTOTYPE((asn1buf *buf, int *retlen)); /* requires *buf is allocated effects Decodes the group of length octets at *buf's diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c index 0d2566e..2d5703e 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode.c +++ b/src/lib/krb5/asn.1/asn1_k_decode.c @@ -112,7 +112,7 @@ return 0 /* scalars */ -asn1_error_code INTERFACE asn1_decode_kerberos_time(buf, val) +asn1_error_code asn1_decode_kerberos_time(buf, val) asn1buf * buf; krb5_timestamp * val; { @@ -128,7 +128,7 @@ asn1_error_code INTERFACE asn1_decode_kerberos_time(buf, val) } #define integer_convert(fname,ktype)\ -asn1_error_code INTERFACE fname(buf, val)\ +asn1_error_code fname(buf, val)\ asn1buf * buf;\ ktype * val;\ {\ @@ -140,7 +140,7 @@ asn1_error_code INTERFACE fname(buf, val)\ return 0;\ } #define unsigned_integer_convert(fname,ktype)\ -asn1_error_code INTERFACE fname(buf, val)\ +asn1_error_code fname(buf, val)\ asn1buf * buf;\ ktype * val;\ {\ @@ -163,7 +163,7 @@ integer_convert(asn1_decode_authdatatype,krb5_authdatatype) unsigned_integer_convert(asn1_decode_ui_2,krb5_ui_2) unsigned_integer_convert(asn1_decode_ui_4,krb5_ui_4) -asn1_error_code INTERFACE asn1_decode_msgtype(buf, val) +asn1_error_code asn1_decode_msgtype(buf, val) asn1buf * buf; krb5_msgtype * val; { @@ -179,7 +179,7 @@ asn1_error_code INTERFACE asn1_decode_msgtype(buf, val) /* structures */ -asn1_error_code INTERFACE asn1_decode_realm(buf, val) +asn1_error_code asn1_decode_realm(buf, val) asn1buf * buf; krb5_principal * val; { @@ -188,7 +188,7 @@ asn1_error_code INTERFACE asn1_decode_realm(buf, val) &((*val)->realm.data)); } -asn1_error_code INTERFACE asn1_decode_principal_name(buf, val) +asn1_error_code asn1_decode_principal_name(buf, val) asn1buf * buf; krb5_principal * val; { @@ -219,7 +219,7 @@ asn1_error_code INTERFACE asn1_decode_principal_name(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_checksum(buf, val) +asn1_error_code asn1_decode_checksum(buf, val) asn1buf * buf; krb5_checksum * val; { @@ -233,7 +233,7 @@ asn1_error_code INTERFACE asn1_decode_checksum(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_encryption_key(buf, val) +asn1_error_code asn1_decode_encryption_key(buf, val) asn1buf * buf; krb5_keyblock * val; { @@ -248,7 +248,7 @@ asn1_error_code INTERFACE asn1_decode_encryption_key(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_encrypted_data(buf, val) +asn1_error_code asn1_decode_encrypted_data(buf, val) asn1buf * buf; krb5_enc_data * val; { @@ -263,7 +263,7 @@ asn1_error_code INTERFACE asn1_decode_encrypted_data(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_krb5_flags(buf, val) +asn1_error_code asn1_decode_krb5_flags(buf, val) asn1buf * buf; krb5_flags * val; { @@ -291,22 +291,22 @@ asn1_error_code INTERFACE asn1_decode_krb5_flags(buf, val) return 0; } -asn1_error_code INTERFACE asn1_decode_ticket_flags(buf, val) +asn1_error_code asn1_decode_ticket_flags(buf, val) asn1buf * buf; krb5_flags * val; { return asn1_decode_krb5_flags(buf,val); } -asn1_error_code INTERFACE asn1_decode_ap_options(buf, val) +asn1_error_code asn1_decode_ap_options(buf, val) asn1buf * buf; krb5_flags * val; { return asn1_decode_krb5_flags(buf,val); } -asn1_error_code INTERFACE asn1_decode_kdc_options(buf, val) +asn1_error_code asn1_decode_kdc_options(buf, val) asn1buf * buf; krb5_flags * val; { return asn1_decode_krb5_flags(buf,val); } -asn1_error_code INTERFACE asn1_decode_transited_encoding(buf, val) +asn1_error_code asn1_decode_transited_encoding(buf, val) asn1buf * buf; krb5_transited * val; { @@ -320,7 +320,7 @@ asn1_error_code INTERFACE asn1_decode_transited_encoding(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_enc_kdc_rep_part(buf, val) +asn1_error_code asn1_decode_enc_kdc_rep_part(buf, val) asn1buf * buf; krb5_enc_kdc_rep_part * val; { @@ -346,7 +346,7 @@ asn1_error_code INTERFACE asn1_decode_enc_kdc_rep_part(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_ticket(buf, val) +asn1_error_code asn1_decode_ticket(buf, val) asn1buf * buf; krb5_ticket * val; { @@ -370,7 +370,7 @@ asn1_error_code INTERFACE asn1_decode_ticket(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_kdc_req(buf, val) +asn1_error_code asn1_decode_kdc_req(buf, val) asn1buf * buf; krb5_kdc_req * val; { @@ -388,7 +388,7 @@ asn1_error_code INTERFACE asn1_decode_kdc_req(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_kdc_req_body(buf, val) +asn1_error_code asn1_decode_kdc_req_body(buf, val) asn1buf * buf; krb5_kdc_req * val; { @@ -425,7 +425,7 @@ asn1_error_code INTERFACE asn1_decode_kdc_req_body(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_krb_safe_body(buf, val) +asn1_error_code asn1_decode_krb_safe_body(buf, val) asn1buf * buf; krb5_safe * val; { @@ -447,7 +447,7 @@ asn1_error_code INTERFACE asn1_decode_krb_safe_body(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_host_address(buf, val) +asn1_error_code asn1_decode_host_address(buf, val) asn1buf * buf; krb5_address * val; { @@ -461,7 +461,7 @@ asn1_error_code INTERFACE asn1_decode_host_address(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_kdc_rep(buf, val) +asn1_error_code asn1_decode_kdc_rep(buf, val) asn1buf * buf; krb5_kdc_rep * val; { @@ -516,14 +516,14 @@ if(*(array) == NULL) return ENOMEM;\ cleanup() -asn1_error_code INTERFACE asn1_decode_authorization_data(buf, val) +asn1_error_code asn1_decode_authorization_data(buf, val) asn1buf * buf; krb5_authdata *** val; { decode_array_body(krb5_authdata,asn1_decode_authdata_elt); } -asn1_error_code INTERFACE asn1_decode_authdata_elt(buf, val) +asn1_error_code asn1_decode_authdata_elt(buf, val) asn1buf * buf; krb5_authdata * val; { @@ -537,28 +537,28 @@ asn1_error_code INTERFACE asn1_decode_authdata_elt(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_host_addresses(buf, val) +asn1_error_code asn1_decode_host_addresses(buf, val) asn1buf * buf; krb5_address *** val; { decode_array_body(krb5_address,asn1_decode_host_address); } -asn1_error_code INTERFACE asn1_decode_sequence_of_ticket(buf, val) +asn1_error_code asn1_decode_sequence_of_ticket(buf, val) asn1buf * buf; krb5_ticket *** val; { decode_array_body(krb5_ticket,asn1_decode_ticket); } -asn1_error_code INTERFACE asn1_decode_sequence_of_krb_cred_info(buf, val) +asn1_error_code asn1_decode_sequence_of_krb_cred_info(buf, val) asn1buf * buf; krb5_cred_info *** val; { decode_array_body(krb5_cred_info,asn1_decode_krb_cred_info); } -asn1_error_code INTERFACE asn1_decode_krb_cred_info(buf, val) +asn1_error_code asn1_decode_krb_cred_info(buf, val) asn1buf * buf; krb5_cred_info * val; { @@ -586,14 +586,14 @@ asn1_error_code INTERFACE asn1_decode_krb_cred_info(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_sequence_of_pa_data(buf, val) +asn1_error_code asn1_decode_sequence_of_pa_data(buf, val) asn1buf * buf; krb5_pa_data *** val; { decode_array_body(krb5_pa_data,asn1_decode_pa_data); } -asn1_error_code INTERFACE asn1_decode_pa_data(buf, val) +asn1_error_code asn1_decode_pa_data(buf, val) asn1buf * buf; krb5_pa_data * val; { @@ -607,14 +607,14 @@ asn1_error_code INTERFACE asn1_decode_pa_data(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_last_req(buf, val) +asn1_error_code asn1_decode_last_req(buf, val) asn1buf * buf; krb5_last_req_entry *** val; { decode_array_body(krb5_last_req_entry,asn1_decode_last_req_entry); } -asn1_error_code INTERFACE asn1_decode_last_req_entry(buf, val) +asn1_error_code asn1_decode_last_req_entry(buf, val) asn1buf * buf; krb5_last_req_entry * val; { @@ -628,7 +628,7 @@ asn1_error_code INTERFACE asn1_decode_last_req_entry(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_sequence_of_enctype(buf, num, val) +asn1_error_code asn1_decode_sequence_of_enctype(buf, num, val) asn1buf * buf; int * num; krb5_enctype ** val; @@ -651,7 +651,7 @@ asn1_error_code INTERFACE asn1_decode_sequence_of_enctype(buf, num, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_passwdsequence(buf, val) +asn1_error_code asn1_decode_passwdsequence(buf, val) asn1buf * buf; passwd_phrase_element * val; { @@ -668,7 +668,7 @@ asn1_error_code INTERFACE asn1_decode_passwdsequence(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_sequence_of_passwdsequence(buf, val) +asn1_error_code asn1_decode_sequence_of_passwdsequence(buf, val) asn1buf * buf; passwd_phrase_element *** val; { diff --git a/src/lib/krb5/asn.1/asn1_k_decode.h b/src/lib/krb5/asn.1/asn1_k_decode.h index b2ccd20..f58f184 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode.h +++ b/src/lib/krb5/asn.1/asn1_k_decode.h @@ -64,98 +64,98 @@ the bounds of *buf */ /* scalars */ -asn1_error_code INTERFACE asn1_decode_int +asn1_error_code asn1_decode_int PROTOTYPE((asn1buf *buf, int *val)); -asn1_error_code INTERFACE asn1_decode_int32 +asn1_error_code asn1_decode_int32 PROTOTYPE((asn1buf *buf, krb5_int32 *val)); -asn1_error_code INTERFACE asn1_decode_kvno +asn1_error_code asn1_decode_kvno PROTOTYPE((asn1buf *buf, krb5_kvno *val)); -asn1_error_code INTERFACE asn1_decode_keytype +asn1_error_code asn1_decode_keytype PROTOTYPE((asn1buf *buf, krb5_keytype *val)); -asn1_error_code INTERFACE asn1_decode_msgtype +asn1_error_code asn1_decode_msgtype PROTOTYPE((asn1buf *buf, krb5_msgtype *val)); -asn1_error_code INTERFACE asn1_decode_cksumtype +asn1_error_code asn1_decode_cksumtype PROTOTYPE((asn1buf *buf, krb5_cksumtype *val)); -asn1_error_code INTERFACE asn1_decode_enctype +asn1_error_code asn1_decode_enctype PROTOTYPE((asn1buf *buf, krb5_enctype *val)); -asn1_error_code INTERFACE asn1_decode_octet +asn1_error_code asn1_decode_octet PROTOTYPE((asn1buf *buf, krb5_octet *val)); -asn1_error_code INTERFACE asn1_decode_addrtype +asn1_error_code asn1_decode_addrtype PROTOTYPE((asn1buf *buf, krb5_addrtype *val)); -asn1_error_code INTERFACE asn1_decode_authdatatype +asn1_error_code asn1_decode_authdatatype PROTOTYPE((asn1buf *buf, krb5_authdatatype *val)); -asn1_error_code INTERFACE asn1_decode_ui_2 +asn1_error_code asn1_decode_ui_2 PROTOTYPE((asn1buf *buf, krb5_ui_2 *val)); -asn1_error_code INTERFACE asn1_decode_ui_4 +asn1_error_code asn1_decode_ui_4 PROTOTYPE((asn1buf *buf, krb5_ui_4 *val)); -asn1_error_code INTERFACE asn1_decode_kerberos_time +asn1_error_code asn1_decode_kerberos_time PROTOTYPE((asn1buf *buf, krb5_timestamp *val)); /* structures */ -asn1_error_code INTERFACE asn1_decode_realm +asn1_error_code asn1_decode_realm PROTOTYPE((asn1buf *buf, krb5_principal *val)); -asn1_error_code INTERFACE asn1_decode_principal_name +asn1_error_code asn1_decode_principal_name PROTOTYPE((asn1buf *buf, krb5_principal *val)); -asn1_error_code INTERFACE asn1_decode_checksum +asn1_error_code asn1_decode_checksum PROTOTYPE((asn1buf *buf, krb5_checksum *val)); -asn1_error_code INTERFACE asn1_decode_encryption_key +asn1_error_code asn1_decode_encryption_key PROTOTYPE((asn1buf *buf, krb5_keyblock *val)); -asn1_error_code INTERFACE asn1_decode_encrypted_data +asn1_error_code asn1_decode_encrypted_data PROTOTYPE((asn1buf *buf, krb5_enc_data *val)); -asn1_error_code INTERFACE asn1_decode_ticket_flags +asn1_error_code asn1_decode_ticket_flags PROTOTYPE((asn1buf *buf, krb5_flags *val)); -asn1_error_code INTERFACE asn1_decode_transited_encoding +asn1_error_code asn1_decode_transited_encoding PROTOTYPE((asn1buf *buf, krb5_transited *val)); -asn1_error_code INTERFACE asn1_decode_enc_kdc_rep_part +asn1_error_code asn1_decode_enc_kdc_rep_part PROTOTYPE((asn1buf *buf, krb5_enc_kdc_rep_part *val)); -asn1_error_code INTERFACE asn1_decode_krb5_flags +asn1_error_code asn1_decode_krb5_flags PROTOTYPE((asn1buf *buf, krb5_flags *val)); -asn1_error_code INTERFACE asn1_decode_ap_options +asn1_error_code asn1_decode_ap_options PROTOTYPE((asn1buf *buf, krb5_flags *val)); -asn1_error_code INTERFACE asn1_decode_kdc_options +asn1_error_code asn1_decode_kdc_options PROTOTYPE((asn1buf *buf, krb5_flags *val)); -asn1_error_code INTERFACE asn1_decode_ticket +asn1_error_code asn1_decode_ticket PROTOTYPE((asn1buf *buf, krb5_ticket *val)); -asn1_error_code INTERFACE asn1_decode_kdc_req +asn1_error_code asn1_decode_kdc_req PROTOTYPE((asn1buf *buf, krb5_kdc_req *val)); -asn1_error_code INTERFACE asn1_decode_kdc_req_body +asn1_error_code asn1_decode_kdc_req_body PROTOTYPE((asn1buf *buf, krb5_kdc_req *val)); -asn1_error_code INTERFACE asn1_decode_krb_safe_body +asn1_error_code asn1_decode_krb_safe_body PROTOTYPE((asn1buf *buf, krb5_safe *val)); -asn1_error_code INTERFACE asn1_decode_host_address +asn1_error_code asn1_decode_host_address PROTOTYPE((asn1buf *buf, krb5_address *val)); -asn1_error_code INTERFACE asn1_decode_kdc_rep +asn1_error_code asn1_decode_kdc_rep PROTOTYPE((asn1buf *buf, krb5_kdc_rep *val)); -asn1_error_code INTERFACE asn1_decode_last_req_entry +asn1_error_code asn1_decode_last_req_entry PROTOTYPE((asn1buf *buf, krb5_last_req_entry *val)); -asn1_error_code INTERFACE asn1_decode_authdata_elt +asn1_error_code asn1_decode_authdata_elt PROTOTYPE((asn1buf *buf, krb5_authdata *val)); -asn1_error_code INTERFACE asn1_decode_krb_cred_info +asn1_error_code asn1_decode_krb_cred_info PROTOTYPE((asn1buf *buf, krb5_cred_info *val)); -asn1_error_code INTERFACE asn1_decode_pa_data +asn1_error_code asn1_decode_pa_data PROTOTYPE((asn1buf *buf, krb5_pa_data *val)); -asn1_error_code INTERFACE asn1_decode_passwdsequence +asn1_error_code asn1_decode_passwdsequence PROTOTYPE((asn1buf *buf, passwd_phrase_element *val)); /* arrays */ -asn1_error_code INTERFACE asn1_decode_authorization_data +asn1_error_code asn1_decode_authorization_data PROTOTYPE((asn1buf *buf, krb5_authdata ***val)); -asn1_error_code INTERFACE asn1_decode_host_addresses +asn1_error_code asn1_decode_host_addresses PROTOTYPE((asn1buf *buf, krb5_address ***val)); -asn1_error_code INTERFACE asn1_decode_sequence_of_ticket +asn1_error_code asn1_decode_sequence_of_ticket PROTOTYPE((asn1buf *buf, krb5_ticket ***val)); -asn1_error_code INTERFACE asn1_decode_sequence_of_krb_cred_info +asn1_error_code asn1_decode_sequence_of_krb_cred_info PROTOTYPE((asn1buf *buf, krb5_cred_info ***val)); -asn1_error_code INTERFACE asn1_decode_sequence_of_pa_data +asn1_error_code asn1_decode_sequence_of_pa_data PROTOTYPE((asn1buf *buf, krb5_pa_data ***val)); -asn1_error_code INTERFACE asn1_decode_last_req +asn1_error_code asn1_decode_last_req PROTOTYPE((asn1buf *buf, krb5_last_req_entry ***val)); -asn1_error_code INTERFACE asn1_decode_sequence_of_enctype +asn1_error_code asn1_decode_sequence_of_enctype PROTOTYPE((asn1buf *buf, int *num, krb5_enctype **val)); -asn1_error_code INTERFACE asn1_decode_sequence_of_passwdsequence +asn1_error_code asn1_decode_sequence_of_passwdsequence PROTOTYPE((asn1buf *buf, passwd_phrase_element ***val)); diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c index 77858f6..731083a 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.c +++ b/src/lib/krb5/asn.1/asn1_k_encode.c @@ -120,7 +120,7 @@ *retlen = sum;\ return 0 -asn1_error_code INTERFACE asn1_encode_ui_4(buf, val, retlen) +asn1_error_code asn1_encode_ui_4(buf, val, retlen) asn1buf * buf; const krb5_ui_4 val; int *retlen; @@ -129,7 +129,7 @@ asn1_error_code INTERFACE asn1_encode_ui_4(buf, val, retlen) } -asn1_error_code INTERFACE asn1_encode_realm(buf, val, retlen) +asn1_error_code asn1_encode_realm(buf, val, retlen) asn1buf * buf; const krb5_principal val; int * retlen; @@ -139,7 +139,7 @@ asn1_error_code INTERFACE asn1_encode_realm(buf, val, retlen) retlen); } -asn1_error_code INTERFACE asn1_encode_principal_name(buf, val, retlen) +asn1_error_code asn1_encode_principal_name(buf, val, retlen) asn1buf * buf; const krb5_principal val; int * retlen; @@ -170,7 +170,7 @@ asn1_error_code INTERFACE asn1_encode_principal_name(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_kerberos_time(buf, val, retlen) +asn1_error_code asn1_encode_kerberos_time(buf, val, retlen) asn1buf * buf; const krb5_timestamp val; int * retlen; @@ -179,7 +179,7 @@ asn1_error_code INTERFACE asn1_encode_kerberos_time(buf, val, retlen) return asn1_encode_generaltime(buf,val,retlen); } -asn1_error_code INTERFACE asn1_encode_host_address(buf, val, retlen) +asn1_error_code asn1_encode_host_address(buf, val, retlen) asn1buf * buf; const krb5_address * val; int * retlen; @@ -195,7 +195,7 @@ asn1_error_code INTERFACE asn1_encode_host_address(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_host_addresses(buf, val, retlen) +asn1_error_code asn1_encode_host_addresses(buf, val, retlen) asn1buf * buf; const krb5_address ** val; int * retlen; @@ -216,7 +216,7 @@ asn1_error_code INTERFACE asn1_encode_host_addresses(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_encrypted_data(buf, val, retlen) +asn1_error_code asn1_encode_encrypted_data(buf, val, retlen) asn1buf * buf; const krb5_enc_data * val; int * retlen; @@ -235,7 +235,7 @@ asn1_error_code INTERFACE asn1_encode_encrypted_data(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_krb5_flags(buf, val, retlen) +asn1_error_code asn1_encode_krb5_flags(buf, val, retlen) asn1buf * buf; const krb5_flags val; int * retlen; @@ -262,7 +262,7 @@ asn1_error_code INTERFACE asn1_encode_krb5_flags(buf, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_ap_options(buf, val, retlen) +asn1_error_code asn1_encode_ap_options(buf, val, retlen) asn1buf * buf; const krb5_flags val; int * retlen; @@ -270,7 +270,7 @@ asn1_error_code INTERFACE asn1_encode_ap_options(buf, val, retlen) return asn1_encode_krb5_flags(buf,val,retlen); } -asn1_error_code INTERFACE asn1_encode_ticket_flags(buf, val, retlen) +asn1_error_code asn1_encode_ticket_flags(buf, val, retlen) asn1buf * buf; const krb5_flags val; int * retlen; @@ -278,7 +278,7 @@ asn1_error_code INTERFACE asn1_encode_ticket_flags(buf, val, retlen) return asn1_encode_krb5_flags(buf,val,retlen); } -asn1_error_code INTERFACE asn1_encode_kdc_options(buf, val, retlen) +asn1_error_code asn1_encode_kdc_options(buf, val, retlen) asn1buf * buf; const krb5_flags val; int * retlen; @@ -286,7 +286,7 @@ asn1_error_code INTERFACE asn1_encode_kdc_options(buf, val, retlen) return asn1_encode_krb5_flags(buf,val,retlen); } -asn1_error_code INTERFACE asn1_encode_authorization_data(buf, val, retlen) +asn1_error_code asn1_encode_authorization_data(buf, val, retlen) asn1buf * buf; const krb5_authdata ** val; int * retlen; @@ -307,7 +307,7 @@ asn1_error_code INTERFACE asn1_encode_authorization_data(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_krb5_authdata_elt(buf, val, retlen) +asn1_error_code asn1_encode_krb5_authdata_elt(buf, val, retlen) asn1buf * buf; const krb5_authdata * val; int * retlen; @@ -326,7 +326,7 @@ asn1_error_code INTERFACE asn1_encode_krb5_authdata_elt(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_kdc_rep(msg_type, buf, val, retlen) +asn1_error_code asn1_encode_kdc_rep(msg_type, buf, val, retlen) int msg_type; asn1buf * buf; const krb5_kdc_rep * val; @@ -351,7 +351,7 @@ asn1_error_code INTERFACE asn1_encode_kdc_rep(msg_type, buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_enc_kdc_rep_part(buf, val, retlen) +asn1_error_code asn1_encode_enc_kdc_rep_part(buf, val, retlen) asn1buf * buf; const krb5_enc_kdc_rep_part * val; int * retlen; @@ -406,7 +406,7 @@ asn1_error_code INTERFACE asn1_encode_enc_kdc_rep_part(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_kdc_req_body(buf, rep, retlen) +asn1_error_code asn1_encode_kdc_req_body(buf, rep, retlen) asn1buf * buf; const krb5_kdc_req * rep; int * retlen; @@ -475,7 +475,7 @@ asn1_error_code INTERFACE asn1_encode_kdc_req_body(buf, rep, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_encryption_key(buf, val, retlen) +asn1_error_code asn1_encode_encryption_key(buf, val, retlen) asn1buf * buf; const krb5_keyblock * val; int * retlen; @@ -491,7 +491,7 @@ asn1_error_code INTERFACE asn1_encode_encryption_key(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_checksum(buf, val, retlen) +asn1_error_code asn1_encode_checksum(buf, val, retlen) asn1buf * buf; const krb5_checksum * val; int * retlen; @@ -507,7 +507,7 @@ asn1_error_code INTERFACE asn1_encode_checksum(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_transited_encoding(buf, val, retlen) +asn1_error_code asn1_encode_transited_encoding(buf, val, retlen) asn1buf * buf; const krb5_transited * val; int * retlen; @@ -526,7 +526,7 @@ asn1_error_code INTERFACE asn1_encode_transited_encoding(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_last_req(buf, val, retlen) +asn1_error_code asn1_encode_last_req(buf, val, retlen) asn1buf * buf; const krb5_last_req_entry ** val; int * retlen; @@ -547,7 +547,7 @@ asn1_error_code INTERFACE asn1_encode_last_req(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_last_req_entry(buf, val, retlen) +asn1_error_code asn1_encode_last_req_entry(buf, val, retlen) asn1buf * buf; const krb5_last_req_entry * val; int * retlen; @@ -563,7 +563,7 @@ asn1_error_code INTERFACE asn1_encode_last_req_entry(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_sequence_of_pa_data(buf, val, retlen) +asn1_error_code asn1_encode_sequence_of_pa_data(buf, val, retlen) asn1buf * buf; const krb5_pa_data ** val; int * retlen; @@ -584,7 +584,7 @@ asn1_error_code INTERFACE asn1_encode_sequence_of_pa_data(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_pa_data(buf, val, retlen) +asn1_error_code asn1_encode_pa_data(buf, val, retlen) asn1buf * buf; const krb5_pa_data * val; int * retlen; @@ -601,7 +601,7 @@ asn1_error_code INTERFACE asn1_encode_pa_data(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_sequence_of_ticket(buf, val, retlen) +asn1_error_code asn1_encode_sequence_of_ticket(buf, val, retlen) asn1buf * buf; const krb5_ticket ** val; int * retlen; @@ -622,7 +622,7 @@ asn1_error_code INTERFACE asn1_encode_sequence_of_ticket(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_ticket(buf, val, retlen) +asn1_error_code asn1_encode_ticket(buf, val, retlen) asn1buf * buf; const krb5_ticket * val; int * retlen; @@ -641,7 +641,7 @@ asn1_error_code INTERFACE asn1_encode_ticket(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_sequence_of_enctype(buf, len, val, retlen) +asn1_error_code asn1_encode_sequence_of_enctype(buf, len, val, retlen) asn1buf * buf; const int len; const krb5_enctype * val; @@ -662,7 +662,7 @@ asn1_error_code INTERFACE asn1_encode_sequence_of_enctype(buf, len, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_kdc_req(msg_type, buf, val, retlen) +asn1_error_code asn1_encode_kdc_req(msg_type, buf, val, retlen) int msg_type; asn1buf * buf; const krb5_kdc_req * val; @@ -684,7 +684,7 @@ asn1_error_code INTERFACE asn1_encode_kdc_req(msg_type, buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_krb_safe_body(buf, val, retlen) +asn1_error_code asn1_encode_krb_safe_body(buf, val, retlen) asn1buf * buf; const krb5_safe * val; int * retlen; @@ -710,7 +710,7 @@ asn1_error_code INTERFACE asn1_encode_krb_safe_body(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_sequence_of_krb_cred_info(buf, val, retlen) +asn1_error_code asn1_encode_sequence_of_krb_cred_info(buf, val, retlen) asn1buf * buf; const krb5_cred_info ** val; int * retlen; @@ -731,7 +731,7 @@ asn1_error_code INTERFACE asn1_encode_sequence_of_krb_cred_info(buf, val, retlen asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_krb_cred_info(buf, val, retlen) +asn1_error_code asn1_encode_krb_cred_info(buf, val, retlen) asn1buf * buf; const krb5_cred_info * val; int * retlen; @@ -767,7 +767,7 @@ asn1_error_code INTERFACE asn1_encode_krb_cred_info(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_sequence_of_passwdsequence(buf, val, retlen) +asn1_error_code asn1_encode_sequence_of_passwdsequence(buf, val, retlen) asn1buf * buf; const passwd_phrase_element ** val; int * retlen; @@ -787,7 +787,7 @@ asn1_error_code INTERFACE asn1_encode_sequence_of_passwdsequence(buf, val, retle asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_passwdsequence(buf, val, retlen) +asn1_error_code asn1_encode_passwdsequence(buf, val, retlen) asn1buf * buf; const passwd_phrase_element * val; int * retlen; diff --git a/src/lib/krb5/asn.1/asn1_k_encode.h b/src/lib/krb5/asn.1/asn1_k_encode.h index 93be05d..a4adb5f 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.h +++ b/src/lib/krb5/asn.1/asn1_k_encode.h @@ -102,114 +102,114 @@ asn1_error_code asn1_encode_asn1_type(asn1buf *buf, Returns ENOMEM if memory runs out. */ -asn1_error_code INTERFACE asn1_encode_ui_4 PROTOTYPE((asn1buf *buf, +asn1_error_code asn1_encode_ui_4 PROTOTYPE((asn1buf *buf, const krb5_ui_4 val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_msgtype PROTOTYPE((asn1buf *buf, +asn1_error_code asn1_encode_msgtype PROTOTYPE((asn1buf *buf, const /*krb5_msgtype*/int val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_realm +asn1_error_code asn1_encode_realm PROTOTYPE((asn1buf *buf, const krb5_principal val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_principal_name +asn1_error_code asn1_encode_principal_name PROTOTYPE((asn1buf *buf, const krb5_principal val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_encrypted_data +asn1_error_code asn1_encode_encrypted_data PROTOTYPE((asn1buf *buf, const krb5_enc_data *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_krb5_flags +asn1_error_code asn1_encode_krb5_flags PROTOTYPE((asn1buf *buf, const krb5_flags val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_ap_options +asn1_error_code asn1_encode_ap_options PROTOTYPE((asn1buf *buf, const krb5_flags val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_ticket_flags +asn1_error_code asn1_encode_ticket_flags PROTOTYPE((asn1buf *buf, const krb5_flags val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_kdc_options +asn1_error_code asn1_encode_kdc_options PROTOTYPE((asn1buf *buf, const krb5_flags val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_authorization_data +asn1_error_code asn1_encode_authorization_data PROTOTYPE((asn1buf *buf, const krb5_authdata **val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_krb5_authdata_elt +asn1_error_code asn1_encode_krb5_authdata_elt PROTOTYPE((asn1buf *buf, const krb5_authdata *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_kdc_rep +asn1_error_code asn1_encode_kdc_rep PROTOTYPE((int msg_type, asn1buf *buf, const krb5_kdc_rep *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_enc_kdc_rep_part +asn1_error_code asn1_encode_enc_kdc_rep_part PROTOTYPE((asn1buf *buf, const krb5_enc_kdc_rep_part *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_ticket +asn1_error_code asn1_encode_ticket PROTOTYPE((asn1buf *buf, const krb5_ticket *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_encryption_key +asn1_error_code asn1_encode_encryption_key PROTOTYPE((asn1buf *buf, const krb5_keyblock *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_kerberos_time +asn1_error_code asn1_encode_kerberos_time PROTOTYPE((asn1buf *buf, const krb5_timestamp val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_checksum +asn1_error_code asn1_encode_checksum PROTOTYPE((asn1buf *buf, const krb5_checksum *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_host_address +asn1_error_code asn1_encode_host_address PROTOTYPE((asn1buf *buf, const krb5_address *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_host_addresses +asn1_error_code asn1_encode_host_addresses PROTOTYPE((asn1buf *buf, const krb5_address **val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_transited_encoding +asn1_error_code asn1_encode_transited_encoding PROTOTYPE((asn1buf *buf, const krb5_transited *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_last_req +asn1_error_code asn1_encode_last_req PROTOTYPE((asn1buf *buf, const krb5_last_req_entry **val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_sequence_of_pa_data +asn1_error_code asn1_encode_sequence_of_pa_data PROTOTYPE((asn1buf *buf, const krb5_pa_data **val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_sequence_of_ticket +asn1_error_code asn1_encode_sequence_of_ticket PROTOTYPE((asn1buf *buf, const krb5_ticket **val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_sequence_of_enctype +asn1_error_code asn1_encode_sequence_of_enctype PROTOTYPE((asn1buf *buf, const int len, const krb5_enctype *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_kdc_req +asn1_error_code asn1_encode_kdc_req PROTOTYPE((int msg_type, asn1buf *buf, const krb5_kdc_req *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_kdc_req_body +asn1_error_code asn1_encode_kdc_req_body PROTOTYPE((asn1buf *buf, const krb5_kdc_req *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_krb_safe_body +asn1_error_code asn1_encode_krb_safe_body PROTOTYPE((asn1buf *buf, const krb5_safe *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_sequence_of_krb_cred_info +asn1_error_code asn1_encode_sequence_of_krb_cred_info PROTOTYPE((asn1buf *buf, const krb5_cred_info **val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_krb_cred_info +asn1_error_code asn1_encode_krb_cred_info PROTOTYPE((asn1buf *buf, const krb5_cred_info *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_last_req_entry +asn1_error_code asn1_encode_last_req_entry PROTOTYPE((asn1buf *buf, const krb5_last_req_entry *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_pa_data +asn1_error_code asn1_encode_pa_data PROTOTYPE((asn1buf *buf, const krb5_pa_data *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_passwdsequence +asn1_error_code asn1_encode_passwdsequence PROTOTYPE((asn1buf *buf, const passwd_phrase_element *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_sequence_of_passwdsequence +asn1_error_code asn1_encode_sequence_of_passwdsequence PROTOTYPE((asn1buf *buf, const passwd_phrase_element **val, int *retlen)); #endif diff --git a/src/lib/krb5/asn.1/asn1_make.c b/src/lib/krb5/asn.1/asn1_make.c index 84d9f4e..ab147f8 100644 --- a/src/lib/krb5/asn.1/asn1_make.c +++ b/src/lib/krb5/asn.1/asn1_make.c @@ -23,7 +23,7 @@ #include "asn1_make.h" -asn1_error_code INTERFACE asn1_make_etag(buf, class, tagnum, in_len, retlen) +asn1_error_code asn1_make_etag(buf, class, tagnum, in_len, retlen) asn1buf * buf; const asn1_class class; const asn1_tagnum tagnum; @@ -33,7 +33,7 @@ asn1_error_code INTERFACE asn1_make_etag(buf, class, tagnum, in_len, retlen) return asn1_make_tag(buf,class,CONSTRUCTED,tagnum,in_len,retlen); } -asn1_error_code INTERFACE asn1_make_tag(buf, class, construction, tagnum, in_len, retlen) +asn1_error_code asn1_make_tag(buf, class, construction, tagnum, in_len, retlen) asn1buf * buf; const asn1_class class; const asn1_construction construction; @@ -57,7 +57,7 @@ asn1_error_code INTERFACE asn1_make_tag(buf, class, construction, tagnum, in_len return 0; } -asn1_error_code INTERFACE asn1_make_length(buf, in_len, retlen) +asn1_error_code asn1_make_length(buf, in_len, retlen) asn1buf * buf; const int in_len; int * retlen; @@ -86,7 +86,7 @@ asn1_error_code INTERFACE asn1_make_length(buf, in_len, retlen) return 0; } -asn1_error_code INTERFACE asn1_make_id(buf, class, construction, tagnum, retlen) +asn1_error_code asn1_make_id(buf, class, construction, tagnum, retlen) asn1buf * buf; const asn1_class class; const asn1_construction construction; @@ -124,7 +124,7 @@ asn1_error_code INTERFACE asn1_make_id(buf, class, construction, tagnum, retlen) return 0; } -asn1_error_code INTERFACE asn1_make_sequence(buf, seq_len, retlen) +asn1_error_code asn1_make_sequence(buf, seq_len, retlen) asn1buf * buf; const int seq_len; int * retlen; @@ -143,7 +143,7 @@ asn1_error_code INTERFACE asn1_make_sequence(buf, seq_len, retlen) return 0; } -asn1_error_code INTERFACE asn1_make_set(buf, set_len, retlen) +asn1_error_code asn1_make_set(buf, set_len, retlen) asn1buf * buf; const int set_len; int * retlen; @@ -162,7 +162,7 @@ asn1_error_code INTERFACE asn1_make_set(buf, set_len, retlen) return 0; } -asn1_error_code INTERFACE asn1_make_string(buf, length, string, retlen) +asn1_error_code asn1_make_string(buf, length, string, retlen) asn1buf * buf; const int length; const char * string; diff --git a/src/lib/krb5/asn.1/asn1_make.h b/src/lib/krb5/asn.1/asn1_make.h index 6fcf891..89ece9b 100644 --- a/src/lib/krb5/asn.1/asn1_make.h +++ b/src/lib/krb5/asn.1/asn1_make.h @@ -43,7 +43,7 @@ asn1_make_string */ -asn1_error_code INTERFACE asn1_make_etag +asn1_error_code asn1_make_etag PROTOTYPE((asn1buf *buf, const asn1_class class, const asn1_tagnum tagnum, @@ -57,7 +57,7 @@ asn1_error_code INTERFACE asn1_make_etag Returns the length of this encoding in *retlen. Returns ENOMEM if memory runs out. */ -asn1_error_code INTERFACE asn1_make_tag +asn1_error_code asn1_make_tag PROTOTYPE((asn1buf *buf, const asn1_class class, const asn1_construction construction, const asn1_tagnum tagnum, @@ -74,7 +74,7 @@ asn1_error_code INTERFACE asn1_make_tag Returns ASN1_OVERFLOW if tagnum exceeds the limits of the implementation. */ -asn1_error_code INTERFACE asn1_make_sequence +asn1_error_code asn1_make_sequence PROTOTYPE((asn1buf *buf, const int seq_len, int *len)); /* requires *buf is allocated, seq_len is the length of a series of sequence components which have just been inserted in *buf @@ -83,7 +83,7 @@ asn1_error_code INTERFACE asn1_make_sequence in *buf. Returns the length of this encoding in *retlen. Returns ENOMEM if memory runs out. */ -asn1_error_code INTERFACE asn1_make_set +asn1_error_code asn1_make_set PROTOTYPE((asn1buf *buf, const int set_len, int *retlen)); /* requires *buf is allocated, seq_len is the length of a series of sequence components which have just been inserted in *buf @@ -92,7 +92,7 @@ asn1_error_code INTERFACE asn1_make_set Returns the length of this encoding in *retlen. Returns ENOMEM if memory runs out. */ -asn1_error_code INTERFACE asn1_make_string +asn1_error_code asn1_make_string PROTOTYPE((asn1buf *buf, const int len, const char *string, int *retlen)); @@ -107,7 +107,7 @@ asn1_error_code INTERFACE asn1_make_string /* Private procedures */ /* "helper" procedure for asn1_make_tag */ -asn1_error_code INTERFACE asn1_make_length +asn1_error_code asn1_make_length PROTOTYPE((asn1buf *buf, const int in_len, int *retlen)); /* requires *buf is allocated, in_len is the length of an ASN.1 encoding which has just been inserted in *buf @@ -116,7 +116,7 @@ asn1_error_code INTERFACE asn1_make_length PROTOTYPE((s) for in_len into *buf */ /* "helper" procedure for asn1_make_tag */ -asn1_error_code INTERFACE asn1_make_id +asn1_error_code asn1_make_id PROTOTYPE((asn1buf *buf, const asn1_class class, const asn1_construction construction, diff --git a/src/lib/krb5/asn.1/asn1_misc.c b/src/lib/krb5/asn.1/asn1_misc.c index eb6516a..a687d06 100644 --- a/src/lib/krb5/asn.1/asn1_misc.c +++ b/src/lib/krb5/asn.1/asn1_misc.c @@ -23,7 +23,7 @@ #include "asn1_misc.h" -asn1_error_code INTERFACE asn1_krb5_realm_copy(target, source) +asn1_error_code asn1_krb5_realm_copy(target, source) krb5_principal target; krb5_principal source; { diff --git a/src/lib/krb5/asn.1/asn1_misc.h b/src/lib/krb5/asn.1/asn1_misc.h index d1364e3..9378b33 100644 --- a/src/lib/krb5/asn.1/asn1_misc.h +++ b/src/lib/krb5/asn.1/asn1_misc.h @@ -27,7 +27,7 @@ #include "k5-int.h" #include "krbasn1.h" -asn1_error_code INTERFACE asn1_krb5_realm_copy +asn1_error_code asn1_krb5_realm_copy PROTOTYPE((krb5_principal target, krb5_principal source)); /* requires target, source, and source->realm are allocated effects Copies source->realm into target->realm. diff --git a/src/lib/krb5/asn.1/asn1buf.c b/src/lib/krb5/asn.1/asn1buf.c index e04b092..327a9df 100644 --- a/src/lib/krb5/asn.1/asn1buf.c +++ b/src/lib/krb5/asn.1/asn1buf.c @@ -51,7 +51,7 @@ #include "asn1buf.h" #include <stdio.h> -asn1_error_code INTERFACE asn1buf_create(buf) +asn1_error_code asn1buf_create(buf) asn1buf ** buf; { *buf = (asn1buf*)calloc(1,sizeof(asn1buf)); @@ -62,7 +62,7 @@ asn1_error_code INTERFACE asn1buf_create(buf) return 0; } -asn1_error_code INTERFACE asn1buf_wrap_data(buf, code) +asn1_error_code asn1buf_wrap_data(buf, code) asn1buf * buf; const krb5_data * code; { @@ -72,7 +72,7 @@ asn1_error_code INTERFACE asn1buf_wrap_data(buf, code) return 0; } -asn1_error_code INTERFACE asn1buf_imbed(subbuf, buf, length) +asn1_error_code asn1buf_imbed(subbuf, buf, length) asn1buf * subbuf; const asn1buf * buf; const int length; @@ -87,14 +87,14 @@ asn1_error_code INTERFACE asn1buf_imbed(subbuf, buf, length) return 0; } -void INTERFACE asn1buf_sync(buf, subbuf) +void asn1buf_sync(buf, subbuf) asn1buf * buf; asn1buf * subbuf; { buf->next = subbuf->next; } -asn1_error_code INTERFACE asn1buf_destroy(buf) +asn1_error_code asn1buf_destroy(buf) asn1buf ** buf; { if (*buf != NULL) { @@ -105,7 +105,7 @@ asn1_error_code INTERFACE asn1buf_destroy(buf) return 0; } -asn1_error_code INTERFACE asn1buf_insert_octet(buf, o) +asn1_error_code asn1buf_insert_octet(buf, o) asn1buf * buf; const int o; { @@ -118,7 +118,7 @@ asn1_error_code INTERFACE asn1buf_insert_octet(buf, o) return 0; } -asn1_error_code INTERFACE asn1buf_insert_octetstring(buf, len, s) +asn1_error_code asn1buf_insert_octetstring(buf, len, s) asn1buf * buf; const int len; const krb5_octet * s; @@ -133,7 +133,7 @@ asn1_error_code INTERFACE asn1buf_insert_octetstring(buf, len, s) return 0; } -asn1_error_code INTERFACE asn1buf_insert_charstring(buf, len, s) +asn1_error_code asn1buf_insert_charstring(buf, len, s) asn1buf * buf; const int len; const char * s; @@ -148,7 +148,7 @@ asn1_error_code INTERFACE asn1buf_insert_charstring(buf, len, s) return 0; } -asn1_error_code INTERFACE asn1buf_remove_octet(buf, o) +asn1_error_code asn1buf_remove_octet(buf, o) asn1buf * buf; asn1_octet * o; { @@ -157,7 +157,7 @@ asn1_error_code INTERFACE asn1buf_remove_octet(buf, o) return 0; } -asn1_error_code INTERFACE asn1buf_remove_octetstring(buf, len, s) +asn1_error_code asn1buf_remove_octetstring(buf, len, s) asn1buf * buf; const int len; asn1_octet ** s; @@ -178,7 +178,7 @@ asn1_error_code INTERFACE asn1buf_remove_octetstring(buf, len, s) return 0; } -asn1_error_code INTERFACE asn1buf_remove_charstring(buf, len, s) +asn1_error_code asn1buf_remove_charstring(buf, len, s) asn1buf * buf; const int len; char ** s; @@ -219,8 +219,7 @@ int asn1buf_remains(buf) else return remain; } - -asn1_error_code INTERFACE asn12krb5_buf(buf, code) +asn1_error_code asn12krb5_buf(buf, code) const asn1buf * buf; krb5_data ** code; { @@ -242,7 +241,7 @@ asn1_error_code INTERFACE asn12krb5_buf(buf, code) /* These parse and unparse procedures should be moved out. They're useful only for debugging and superfluous in the production version. */ -asn1_error_code INTERFACE asn1buf_unparse(buf, s) +asn1_error_code asn1buf_unparse(buf, s) const asn1buf * buf; char ** s; { @@ -268,7 +267,7 @@ asn1_error_code INTERFACE asn1buf_unparse(buf, s) return 0; } -asn1_error_code INTERFACE asn1buf_hex_unparse(buf, s) +asn1_error_code asn1buf_hex_unparse(buf, s) const asn1buf * buf; char ** s; { @@ -305,21 +304,21 @@ asn1_error_code INTERFACE asn1buf_hex_unparse(buf, s) /****************************************************************/ /* Private Procedures */ -int INTERFACE asn1buf_size(buf) +int asn1buf_size(buf) const asn1buf * buf; { if(buf == NULL || buf->base == NULL) return 0; return buf->bound - buf->base + 1; } -int INTERFACE asn1buf_free(buf) +int asn1buf_free(buf) const asn1buf * buf; { if(buf == NULL || buf->base == NULL) return 0; else return buf->bound - buf->next + 1; } -asn1_error_code INTERFACE asn1buf_ensure_space(buf, amount) +asn1_error_code asn1buf_ensure_space(buf, amount) asn1buf * buf; const int amount; { @@ -331,7 +330,7 @@ asn1_error_code INTERFACE asn1buf_ensure_space(buf, amount) return 0; } -asn1_error_code INTERFACE asn1buf_expand(buf, inc) +asn1_error_code asn1buf_expand(buf, inc) asn1buf * buf; const int inc; { @@ -356,7 +355,7 @@ asn1_error_code INTERFACE asn1buf_expand(buf, inc) return 0; } -int INTERFACE asn1buf_len(buf) +int asn1buf_len(buf) const asn1buf * buf; { return buf->next - buf->base; diff --git a/src/lib/krb5/asn.1/asn1buf.h b/src/lib/krb5/asn.1/asn1buf.h index 0d18f3b..f3f4a3f 100644 --- a/src/lib/krb5/asn.1/asn1buf.h +++ b/src/lib/krb5/asn.1/asn1buf.h @@ -46,12 +46,12 @@ typedef struct code_buffer_rep { (asn1buf_len) */ -asn1_error_code INTERFACE asn1buf_create +asn1_error_code asn1buf_create PROTOTYPE((asn1buf **buf)); /* effects Creates a new encoding buffer pointed to by *buf. Returns ENOMEM if the buffer can't be created. */ -asn1_error_code INTERFACE asn1buf_wrap_data +asn1_error_code asn1buf_wrap_data PROTOTYPE((asn1buf *buf, const krb5_data *code)); /* requires *buf has already been allocated effects Turns *buf into a "wrapper" for *code. i.e. *buf is set up @@ -59,7 +59,7 @@ asn1_error_code INTERFACE asn1buf_wrap_data is the top of *code. Returns ASN1_MISSING_FIELD if code is empty. */ -asn1_error_code INTERFACE asn1buf_imbed +asn1_error_code asn1buf_imbed PROTOTYPE((asn1buf *subbuf, const asn1buf *buf, const int length)); /* requires *subbuf and *buf are allocated effects *subbuf becomes a sub-buffer of *buf. *subbuf begins @@ -68,22 +68,22 @@ asn1_error_code INTERFACE asn1buf_imbed that case, ASN1_OVERRUN is returned) *subbuf's current position starts at the beginning of *subbuf. */ -void INTERFACE asn1buf_sync +void asn1buf_sync PROTOTYPE((asn1buf *buf, asn1buf *subbuf)); /* requires *subbuf is a sub-buffer of *buf, as created by asn1buf_imbed. effects Synchronizes *buf's current position to match that of *subbuf. */ -asn1_error_code INTERFACE asn1buf_destroy +asn1_error_code asn1buf_destroy PROTOTYPE((asn1buf **buf)); /* effects Deallocates **buf, sets *buf to NULL. */ -asn1_error_code INTERFACE asn1buf_insert_octet +asn1_error_code asn1buf_insert_octet PROTOTYPE((asn1buf *buf, const int o)); /* requires *buf is allocated effects Inserts o into the buffer *buf, expanding the buffer if necessary. Returns ENOMEM memory is exhausted. */ -asn1_error_code INTERFACE asn1buf_insert_octetstring +asn1_error_code asn1buf_insert_octetstring PROTOTYPE((asn1buf *buf, const int len, const asn1_octet *s)); /* requires *buf is allocated modifies *buf @@ -91,7 +91,7 @@ asn1_error_code INTERFACE asn1buf_insert_octetstring into the buffer *buf, expanding the buffer if necessary. Returns ENOMEM if memory is exhausted. */ -asn1_error_code INTERFACE asn1buf_insert_charstring +asn1_error_code asn1buf_insert_charstring PROTOTYPE((asn1buf *buf, const int len, const char *s)); /* requires *buf is allocated modifies *buf @@ -99,14 +99,14 @@ asn1_error_code INTERFACE asn1buf_insert_charstring into the buffer *buf, expanding the buffer if necessary. Returns ENOMEM if memory is exhuasted. */ -asn1_error_code INTERFACE asn1buf_remove_octet +asn1_error_code asn1buf_remove_octet PROTOTYPE((asn1buf *buf, asn1_octet *o)); /* requires *buf is allocated effects Returns *buf's current octet in *o and advances to the next octet. Returns ASN1_OVERRUN if *buf has already been exhuasted. */ -asn1_error_code INTERFACE asn1buf_remove_octetstring +asn1_error_code asn1buf_remove_octetstring PROTOTYPE((asn1buf *buf, const int len, asn1_octet **s)); /* requires *buf is allocated effects Removes the next len octets of *buf and returns them in **s. @@ -114,7 +114,7 @@ asn1_error_code INTERFACE asn1buf_remove_octetstring left in *buf. Returns ENOMEM if *s could not be allocated. */ -asn1_error_code INTERFACE asn1buf_remove_charstring +asn1_error_code asn1buf_remove_charstring PROTOTYPE((asn1buf *buf, const int len, char **s)); /* requires *buf is allocated @@ -123,26 +123,26 @@ asn1_error_code INTERFACE asn1buf_remove_charstring left in *buf. Returns ENOMEM if *s could not be allocated. */ -asn1_error_code INTERFACE asn1buf_unparse +asn1_error_code asn1buf_unparse PROTOTYPE((const asn1buf *buf, char **s)); /* modifies *s effects Returns a human-readable representation of *buf in *s, where each octet in *buf is represented by a character in *s. */ -asn1_error_code INTERFACE asn1buf_hex_unparse +asn1_error_code asn1buf_hex_unparse PROTOTYPE((const asn1buf *buf, char **s)); /* modifies *s effects Returns a human-readable representation of *buf in *s, where each octet in *buf is represented by a 2-digit hexadecimal number in *s. */ -asn1_error_code INTERFACE asn12krb5_buf +asn1_error_code asn12krb5_buf PROTOTYPE((const asn1buf *buf, krb5_data **code)); /* modifies *code effects Instantiates **code with the krb5_data representation of **buf. */ -int INTERFACE asn1buf_remains +int asn1buf_remains PROTOTYPE((asn1buf *buf)); /* requires *buf is a buffer containing an asn.1 structure or array modifies *buf @@ -150,18 +150,18 @@ int INTERFACE asn1buf_remains /**************** Private Procedures ****************/ -int INTERFACE asn1buf_size +int asn1buf_size PROTOTYPE((const asn1buf *buf)); /* requires *buf has been created and not destroyed effects Returns the total size PROTOTYPE((in octets) of buf's octet buffer. */ -int INTERFACE asn1buf_free +int asn1buf_free PROTOTYPE((const asn1buf *buf)); /* requires *buf is allocated effects Returns the number of unused, allocated octets in *buf. */ -asn1_error_code INTERFACE asn1buf_ensure_space +asn1_error_code asn1buf_ensure_space PROTOTYPE((asn1buf *buf, const int amount)); /* requires *buf is allocated modifies *buf @@ -169,14 +169,14 @@ asn1_error_code INTERFACE asn1buf_ensure_space expanded to have at least amount octets of free space. Returns ENOMEM memory is exhausted. */ -asn1_error_code INTERFACE asn1buf_expand +asn1_error_code asn1buf_expand PROTOTYPE((asn1buf *buf, const int inc)); /* requires *buf is allocated modifies *buf effects Expands *buf by allocating space for inc more octets. Returns ENOMEM if memory is exhausted. */ -int INTERFACE asn1buf_len +int asn1buf_len PROTOTYPE((const asn1buf *buf)); /* requires *buf is allocated effects Returns the length of the encoding in *buf. */ diff --git a/src/lib/krb5/asn.1/krb5_decode.c b/src/lib/krb5/asn.1/krb5_decode.c index 2c1cf4d..fd716f4 100644 --- a/src/lib/krb5/asn.1/krb5_decode.c +++ b/src/lib/krb5/asn.1/krb5_decode.c @@ -147,7 +147,7 @@ if(tagnum == (tagexpect)){\ #define cleanup()\ return 0 -krb5_error_code INTERFACE decode_krb5_authenticator(code, rep) +krb5_error_code decode_krb5_authenticator(code, rep) const krb5_data * code; krb5_authenticator ** rep; { @@ -176,7 +176,7 @@ krb5_error_code INTERFACE decode_krb5_authenticator(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_ticket(code, rep) +krb5_error_code decode_krb5_ticket(code, rep) const krb5_data * code; krb5_ticket ** rep; { @@ -198,7 +198,7 @@ krb5_error_code INTERFACE decode_krb5_ticket(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_encryption_key(code, rep) +krb5_error_code decode_krb5_encryption_key(code, rep) const krb5_data * code; krb5_keyblock ** rep; { @@ -215,7 +215,7 @@ krb5_error_code INTERFACE decode_krb5_encryption_key(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_enc_tkt_part(code, rep) +krb5_error_code decode_krb5_enc_tkt_part(code, rep) const krb5_data * code; krb5_enc_tkt_part ** rep; { @@ -242,7 +242,7 @@ krb5_error_code INTERFACE decode_krb5_enc_tkt_part(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_enc_kdc_rep_part(code, rep) +krb5_error_code decode_krb5_enc_kdc_rep_part(code, rep) const krb5_data * code; krb5_enc_kdc_rep_part ** rep; { @@ -262,7 +262,7 @@ krb5_error_code INTERFACE decode_krb5_enc_kdc_rep_part(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_as_rep(code, rep) +krb5_error_code decode_krb5_as_rep(code, rep) const krb5_data * code; krb5_kdc_rep ** rep; { @@ -280,7 +280,7 @@ krb5_error_code INTERFACE decode_krb5_as_rep(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_tgs_rep(code, rep) +krb5_error_code decode_krb5_tgs_rep(code, rep) const krb5_data * code; krb5_kdc_rep ** rep; { @@ -297,7 +297,7 @@ krb5_error_code INTERFACE decode_krb5_tgs_rep(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_ap_req(code, rep) +krb5_error_code decode_krb5_ap_req(code, rep) const krb5_data * code; krb5_ap_req ** rep; { @@ -324,7 +324,7 @@ krb5_error_code INTERFACE decode_krb5_ap_req(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_ap_rep(code, rep) +krb5_error_code decode_krb5_ap_rep(code, rep) const krb5_data * code; krb5_ap_rep ** rep; { @@ -348,7 +348,7 @@ krb5_error_code INTERFACE decode_krb5_ap_rep(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_ap_rep_enc_part(code, rep) +krb5_error_code decode_krb5_ap_rep_enc_part(code, rep) const krb5_data * code; krb5_ap_rep_enc_part ** rep; { @@ -367,7 +367,7 @@ krb5_error_code INTERFACE decode_krb5_ap_rep_enc_part(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_as_req(code, rep) +krb5_error_code decode_krb5_as_req(code, rep) const krb5_data * code; krb5_kdc_req ** rep; { @@ -384,7 +384,7 @@ krb5_error_code INTERFACE decode_krb5_as_req(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_tgs_req(code, rep) +krb5_error_code decode_krb5_tgs_req(code, rep) const krb5_data * code; krb5_kdc_req ** rep; { @@ -401,7 +401,7 @@ krb5_error_code INTERFACE decode_krb5_tgs_req(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_kdc_req_body(code, rep) +krb5_error_code decode_krb5_kdc_req_body(code, rep) const krb5_data * code; krb5_kdc_req ** rep; { @@ -414,7 +414,7 @@ krb5_error_code INTERFACE decode_krb5_kdc_req_body(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_safe(code, rep) +krb5_error_code decode_krb5_safe(code, rep) const krb5_data * code; krb5_safe ** rep; { @@ -440,7 +440,7 @@ krb5_error_code INTERFACE decode_krb5_safe(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_priv(code, rep) +krb5_error_code decode_krb5_priv(code, rep) const krb5_data * code; krb5_priv ** rep; { @@ -464,7 +464,7 @@ krb5_error_code INTERFACE decode_krb5_priv(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_enc_priv_part(code, rep) +krb5_error_code decode_krb5_enc_priv_part(code, rep) const krb5_data * code; krb5_priv_enc_part ** rep; { @@ -486,7 +486,7 @@ krb5_error_code INTERFACE decode_krb5_enc_priv_part(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_cred(code, rep) +krb5_error_code decode_krb5_cred(code, rep) const krb5_data * code; krb5_cred ** rep; { @@ -511,7 +511,7 @@ krb5_error_code INTERFACE decode_krb5_cred(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_enc_cred_part(code, rep) +krb5_error_code decode_krb5_enc_cred_part(code, rep) const krb5_data * code; krb5_cred_enc_part ** rep; { @@ -533,7 +533,7 @@ krb5_error_code INTERFACE decode_krb5_enc_cred_part(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_error(code, rep) +krb5_error_code decode_krb5_error(code, rep) const krb5_data * code; krb5_error ** rep; { @@ -569,7 +569,7 @@ krb5_error_code INTERFACE decode_krb5_error(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_authdata(code, rep) +krb5_error_code decode_krb5_authdata(code, rep) const krb5_data * code; krb5_authdata *** rep; { @@ -580,7 +580,7 @@ krb5_error_code INTERFACE decode_krb5_authdata(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_pwd_sequence(code, rep) +krb5_error_code decode_krb5_pwd_sequence(code, rep) const krb5_data * code; passwd_phrase_element ** rep; { @@ -591,7 +591,7 @@ krb5_error_code INTERFACE decode_krb5_pwd_sequence(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_pwd_data(code, rep) +krb5_error_code decode_krb5_pwd_data(code, rep) const krb5_data * code; krb5_pwd_data ** rep; { diff --git a/src/lib/krb5/asn.1/krb5_encode.c b/src/lib/krb5/asn.1/krb5_encode.c index dc85fdf..aa7ad61 100644 --- a/src/lib/krb5/asn.1/krb5_encode.c +++ b/src/lib/krb5/asn.1/krb5_encode.c @@ -141,7 +141,7 @@ \ return 0 -krb5_error_code INTERFACE encode_krb5_authenticator(rep, code) +krb5_error_code encode_krb5_authenticator(rep, code) const krb5_authenticator * rep; krb5_data ** code; { @@ -198,7 +198,7 @@ krb5_error_code INTERFACE encode_krb5_authenticator(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_ticket(rep, code) +krb5_error_code encode_krb5_ticket(rep, code) const krb5_ticket * rep; krb5_data ** code; { @@ -223,7 +223,7 @@ krb5_error_code INTERFACE encode_krb5_ticket(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_encryption_key(rep, code) +krb5_error_code encode_krb5_encryption_key(rep, code) const krb5_keyblock * rep; krb5_data ** code; { @@ -241,7 +241,7 @@ krb5_error_code INTERFACE encode_krb5_encryption_key(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_enc_tkt_part(rep, code) +krb5_error_code encode_krb5_enc_tkt_part(rep, code) const krb5_enc_tkt_part * rep; krb5_data ** code; { @@ -293,7 +293,7 @@ krb5_error_code INTERFACE encode_krb5_enc_tkt_part(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_enc_kdc_rep_part(rep, code) +krb5_error_code encode_krb5_enc_kdc_rep_part(rep, code) const krb5_enc_kdc_rep_part * rep; krb5_data ** code; { @@ -321,7 +321,7 @@ krb5_error_code INTERFACE encode_krb5_enc_kdc_rep_part(rep, code) } /* yes, the translation is identical to that used for KDC__REP */ -krb5_error_code INTERFACE encode_krb5_as_rep(rep, code) +krb5_error_code encode_krb5_as_rep(rep, code) const krb5_kdc_rep * rep; krb5_data ** code; { @@ -338,7 +338,7 @@ krb5_error_code INTERFACE encode_krb5_as_rep(rep, code) } /* yes, the translation is identical to that used for KDC__REP */ -krb5_error_code INTERFACE encode_krb5_tgs_rep( rep, code) +krb5_error_code encode_krb5_tgs_rep( rep, code) const krb5_kdc_rep * rep; krb5_data ** code; { @@ -354,7 +354,7 @@ krb5_error_code INTERFACE encode_krb5_tgs_rep( rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_ap_req(rep, code) +krb5_error_code encode_krb5_ap_req(rep, code) const krb5_ap_req * rep; krb5_data ** code; { @@ -382,7 +382,7 @@ krb5_error_code INTERFACE encode_krb5_ap_req(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_ap_rep(rep, code) +krb5_error_code encode_krb5_ap_rep(rep, code) const krb5_ap_rep * rep; krb5_data ** code; { @@ -405,7 +405,7 @@ krb5_error_code INTERFACE encode_krb5_ap_rep(rep, code) } -krb5_error_code INTERFACE encode_krb5_ap_rep_enc_part(rep, code) +krb5_error_code encode_krb5_ap_rep_enc_part(rep, code) const krb5_ap_rep_enc_part * rep; krb5_data ** code; { @@ -432,7 +432,7 @@ krb5_error_code INTERFACE encode_krb5_ap_rep_enc_part(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_as_req(rep, code) +krb5_error_code encode_krb5_as_req(rep, code) const krb5_kdc_req * rep; krb5_data ** code; { @@ -448,7 +448,7 @@ krb5_error_code INTERFACE encode_krb5_as_req(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_tgs_req(rep, code) +krb5_error_code encode_krb5_tgs_req(rep, code) const krb5_kdc_req * rep; krb5_data ** code; { @@ -464,7 +464,7 @@ krb5_error_code INTERFACE encode_krb5_tgs_req(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_kdc_req_body(rep, code) +krb5_error_code encode_krb5_kdc_req_body(rep, code) const krb5_kdc_req * rep; krb5_data ** code; { @@ -478,7 +478,7 @@ krb5_error_code INTERFACE encode_krb5_kdc_req_body(rep, code) } -krb5_error_code INTERFACE encode_krb5_safe(rep, code) +krb5_error_code encode_krb5_safe(rep, code) const krb5_safe * rep; krb5_data ** code; { @@ -503,7 +503,7 @@ krb5_error_code INTERFACE encode_krb5_safe(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_priv(rep, code) +krb5_error_code encode_krb5_priv(rep, code) const krb5_priv * rep; krb5_data ** code; { @@ -525,7 +525,7 @@ krb5_error_code INTERFACE encode_krb5_priv(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_enc_priv_part(rep, code) +krb5_error_code encode_krb5_enc_priv_part(rep, code) const krb5_priv_enc_part * rep; krb5_data ** code; { @@ -559,7 +559,7 @@ krb5_error_code INTERFACE encode_krb5_enc_priv_part(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_cred(rep, code) +krb5_error_code encode_krb5_cred(rep, code) const krb5_cred * rep; krb5_data ** code; { @@ -584,7 +584,7 @@ krb5_error_code INTERFACE encode_krb5_cred(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_enc_cred_part(rep, code) +krb5_error_code encode_krb5_enc_cred_part(rep, code) const krb5_cred_enc_part * rep; krb5_data ** code; { @@ -620,7 +620,7 @@ krb5_error_code INTERFACE encode_krb5_enc_cred_part(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_error(rep, code) +krb5_error_code encode_krb5_error(rep, code) const krb5_error * rep; krb5_data ** code; { @@ -677,7 +677,7 @@ krb5_error_code INTERFACE encode_krb5_error(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_authdata(rep, code) +krb5_error_code encode_krb5_authdata(rep, code) const krb5_authdata ** rep; krb5_data ** code; { @@ -698,7 +698,7 @@ krb5_error_code INTERFACE encode_krb5_authdata(rep, code) } /* Sandia Additions */ -krb5_error_code INTERFACE encode_krb5_pwd_sequence( rep, code) +krb5_error_code encode_krb5_pwd_sequence( rep, code) const passwd_phrase_element * rep; krb5_data ** code; { @@ -709,7 +709,7 @@ krb5_error_code INTERFACE encode_krb5_pwd_sequence( rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_pwd_data(rep, code) +krb5_error_code encode_krb5_pwd_data(rep, code) const krb5_pwd_data * rep; krb5_data ** code; { diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 6974ed5..8319cfe 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * ccbase.c: removed unneeded INTERFACE from non-api functions. + Wed Mar 22 11:47:49 1995 <tytso@rsx-11.mit.edu> * Makefile.in (CFLAGS): Make -I options work when the build and diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c index c86212c..05a18d0 100644 --- a/src/lib/krb5/ccache/ccbase.c +++ b/src/lib/krb5/ccache/ccbase.c @@ -39,7 +39,7 @@ static struct krb5_cc_typelist *cc_typehead = 0; * If override is set, replace any existing ccache with that type tag */ -krb5_error_code INTERFACE +krb5_error_code krb5_cc_register(context, ops, override) krb5_context context; krb5_cc_ops *ops; @@ -73,7 +73,7 @@ krb5_cc_register(context, ops, override) * particular cache type. */ -krb5_error_code INTERFACE +krb5_error_code krb5_cc_resolve (context, name, cache) krb5_context context; char *name; diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog index 22fc4bf..8df7297 100644 --- a/src/lib/krb5/ccache/file/ChangeLog +++ b/src/lib/krb5/ccache/file/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + Wed Mar 22 11:24:07 1995 Keith Vetter (keithv@fusion.com) * fcc-proto.h: added prototype for cache changing hook, diff --git a/src/lib/krb5/ccache/file/fcc-proto.h b/src/lib/krb5/ccache/file/fcc-proto.h index 9d66875..d8f9db0 100644 --- a/src/lib/krb5/ccache/file/fcc-proto.h +++ b/src/lib/krb5/ccache/file/fcc-proto.h @@ -33,7 +33,7 @@ krb5_error_code INTERFACE krb5_fcc_close PROTOTYPE((krb5_context, krb5_ccache id )); /* fcc_defnam.c */ -char * INTERFACE krb5_fcc_default_name +char * krb5_fcc_default_name PROTOTYPE((krb5_context)); /* fcc_destry.c */ @@ -68,27 +68,27 @@ krb5_error_code INTERFACE krb5_fcc_next_cred krb5_creds *creds )); /* fcc_read.c */ -krb5_error_code INTERFACE krb5_fcc_read_principal +krb5_error_code krb5_fcc_read_principal PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ )); -krb5_error_code INTERFACE krb5_fcc_read_keyblock +krb5_error_code krb5_fcc_read_keyblock PROTOTYPE((krb5_context, krb5_ccache id , krb5_keyblock *keyblock )); -krb5_error_code INTERFACE krb5_fcc_read_data +krb5_error_code krb5_fcc_read_data PROTOTYPE((krb5_context, krb5_ccache id , krb5_data *data )); -krb5_error_code INTERFACE krb5_fcc_read_int32 +krb5_error_code krb5_fcc_read_int32 PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 *i )); -krb5_error_code INTERFACE krb5_fcc_read_ui_2 +krb5_error_code krb5_fcc_read_ui_2 PROTOTYPE((krb5_context, krb5_ccache id , krb5_ui_2 *i )); -krb5_error_code INTERFACE krb5_fcc_read_octet +krb5_error_code krb5_fcc_read_octet PROTOTYPE((krb5_context, krb5_ccache id , krb5_octet *i )); -krb5_error_code INTERFACE krb5_fcc_read_times +krb5_error_code krb5_fcc_read_times PROTOTYPE((krb5_context, krb5_ccache id , krb5_ticket_times *t )); -krb5_error_code INTERFACE krb5_fcc_read_addrs +krb5_error_code krb5_fcc_read_addrs PROTOTYPE((krb5_context, krb5_ccache, krb5_address ***)); -krb5_error_code INTERFACE krb5_fcc_read_addr +krb5_error_code krb5_fcc_read_addr PROTOTYPE((krb5_context, krb5_ccache, krb5_address *)); -krb5_error_code INTERFACE krb5_fcc_read_authdata +krb5_error_code krb5_fcc_read_authdata PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata ***)); -krb5_error_code INTERFACE krb5_fcc_read_authdatum +krb5_error_code krb5_fcc_read_authdatum PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata *)); /* fcc_reslv.c */ @@ -112,7 +112,7 @@ krb5_error_code INTERFACE krb5_fcc_store PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds )); /* fcc_skip.c */ -krb5_error_code INTERFACE krb5_fcc_skip_principal +krb5_error_code krb5_fcc_skip_principal PROTOTYPE((krb5_context, krb5_ccache id )); /* fcc_sflags.c */ @@ -126,39 +126,39 @@ krb5_error_code krb5_change_cache /* fcc_write.c */ -krb5_error_code INTERFACE krb5_fcc_write +krb5_error_code krb5_fcc_write PROTOTYPE((krb5_context, krb5_ccache id , krb5_pointer buf , int len )); -krb5_error_code INTERFACE krb5_fcc_store_principal +krb5_error_code krb5_fcc_store_principal PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ )); -krb5_error_code INTERFACE krb5_fcc_store_keyblock +krb5_error_code krb5_fcc_store_keyblock PROTOTYPE((krb5_context, krb5_ccache id , krb5_keyblock *keyblock )); -krb5_error_code INTERFACE krb5_fcc_store_data +krb5_error_code krb5_fcc_store_data PROTOTYPE((krb5_context, krb5_ccache id , krb5_data *data )); -krb5_error_code INTERFACE krb5_fcc_store_int32 +krb5_error_code krb5_fcc_store_int32 PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i )); -krb5_error_code INTERFACE krb5_fcc_store_ui_2 +krb5_error_code krb5_fcc_store_ui_2 PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i )); -krb5_error_code INTERFACE krb5_fcc_store_octet +krb5_error_code krb5_fcc_store_octet PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i )); -krb5_error_code INTERFACE krb5_fcc_store_times +krb5_error_code krb5_fcc_store_times PROTOTYPE((krb5_context, krb5_ccache id , krb5_ticket_times *t )); -krb5_error_code INTERFACE krb5_fcc_store_addrs +krb5_error_code krb5_fcc_store_addrs PROTOTYPE((krb5_context, krb5_ccache , krb5_address ** )); -krb5_error_code INTERFACE krb5_fcc_store_addr +krb5_error_code krb5_fcc_store_addr PROTOTYPE((krb5_context, krb5_ccache , krb5_address * )); -krb5_error_code INTERFACE krb5_fcc_store_authdata +krb5_error_code krb5_fcc_store_authdata PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata **)); -krb5_error_code INTERFACE krb5_fcc_store_authdatum +krb5_error_code krb5_fcc_store_authdatum PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata *)); /* fcc_errs.c */ -krb5_error_code INTERFACE krb5_fcc_interpret +krb5_error_code krb5_fcc_interpret PROTOTYPE((krb5_context, int )); /* fcc_maybe.c */ -krb5_error_code INTERFACE krb5_fcc_close_file +krb5_error_code krb5_fcc_close_file PROTOTYPE((krb5_context, krb5_ccache)); -krb5_error_code INTERFACE krb5_fcc_open_file +krb5_error_code krb5_fcc_open_file PROTOTYPE((krb5_context, krb5_ccache, int)); #endif /* KRB5_FCC_PROTO__ */ diff --git a/src/lib/krb5/ccache/file/fcc_errs.c b/src/lib/krb5/ccache/file/fcc_errs.c index 43d8525..b93e162 100644 --- a/src/lib/krb5/ccache/file/fcc_errs.c +++ b/src/lib/krb5/ccache/file/fcc_errs.c @@ -28,7 +28,7 @@ #include "fcc.h" -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_interpret(context, errnum) krb5_context context; int errnum; diff --git a/src/lib/krb5/ccache/file/fcc_maybe.c b/src/lib/krb5/ccache/file/fcc_maybe.c index 43579aa..6378d68 100644 --- a/src/lib/krb5/ccache/file/fcc_maybe.c +++ b/src/lib/krb5/ccache/file/fcc_maybe.c @@ -183,7 +183,7 @@ int lockunlock; #endif } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_close_file (context, id) krb5_context context; krb5_ccache id; @@ -204,7 +204,7 @@ krb5_fcc_close_file (context, id) return (ret == -1) ? krb5_fcc_interpret (context, errno) : 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_open_file (context, id, mode) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/file/fcc_read.c b/src/lib/krb5/ccache/file/fcc_read.c index ae8052c..e963d9e 100644 --- a/src/lib/krb5/ccache/file/fcc_read.c +++ b/src/lib/krb5/ccache/file/fcc_read.c @@ -40,7 +40,7 @@ * KRB5_CC_END - there were not len bytes available * system errors (read) */ -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read(context, id, buf, len) krb5_context context; krb5_ccache id; @@ -75,7 +75,7 @@ krb5_fcc_read(context, id, buf, len) * KRB5_CC_NOMEM */ -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_principal(context, id, princ) krb5_context context; krb5_ccache id; @@ -146,7 +146,7 @@ krb5_fcc_read_principal(context, id, princ) return kret; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_addrs(context, id, addrs) krb5_context context; krb5_ccache id; @@ -189,7 +189,7 @@ krb5_fcc_read_addrs(context, id, addrs) return kret; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_keyblock(context, id, keyblock) krb5_context context; krb5_ccache id; @@ -238,7 +238,7 @@ krb5_fcc_read_keyblock(context, id, keyblock) return kret; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_data(context, id, data) krb5_context context; krb5_ccache id; @@ -276,7 +276,7 @@ krb5_fcc_read_data(context, id, data) return kret; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_addr(context, id, addr) krb5_context context; krb5_ccache id; @@ -316,7 +316,7 @@ krb5_fcc_read_addr(context, id, addr) return kret; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_int32(context, id, i) krb5_context context; krb5_ccache id; @@ -343,7 +343,7 @@ krb5_fcc_read_int32(context, id, i) } } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_ui_2(context, id, i) krb5_context context; krb5_ccache id; @@ -365,7 +365,7 @@ krb5_fcc_read_ui_2(context, id, i) } } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_octet(context, id, i) krb5_context context; krb5_ccache id; @@ -375,7 +375,7 @@ krb5_fcc_read_octet(context, id, i) } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_times(context, id, t) krb5_context context; krb5_ccache id; @@ -410,7 +410,7 @@ errout: return retval; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_authdata(context, id, a) krb5_context context; krb5_ccache id; @@ -456,7 +456,7 @@ krb5_fcc_read_authdata(context, id, a) return kret; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_authdatum(context, id, a) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/file/fcc_skip.c b/src/lib/krb5/ccache/file/fcc_skip.c index f4db9b3..15aa43b 100644 --- a/src/lib/krb5/ccache/file/fcc_skip.c +++ b/src/lib/krb5/ccache/file/fcc_skip.c @@ -28,7 +28,7 @@ #include "fcc.h" -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_skip_principal(context, id) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/file/fcc_write.c b/src/lib/krb5/ccache/file/fcc_write.c index e433bff..38067b5 100644 --- a/src/lib/krb5/ccache/file/fcc_write.c +++ b/src/lib/krb5/ccache/file/fcc_write.c @@ -41,7 +41,7 @@ * Errors: * system errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_write(context, id, buf, len) krb5_context context; krb5_ccache id; @@ -72,7 +72,7 @@ krb5_fcc_write(context, id, buf, len) * system errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_principal(context, id, princ) krb5_context context; krb5_ccache id; @@ -111,7 +111,7 @@ krb5_fcc_store_principal(context, id, princ) return KRB5_OK; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_addrs(context, id, addrs) krb5_context context; krb5_ccache id; @@ -138,7 +138,7 @@ krb5_fcc_store_addrs(context, id, addrs) return KRB5_OK; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_keyblock(context, id, keyblock) krb5_context context; krb5_ccache id; @@ -159,7 +159,7 @@ krb5_fcc_store_keyblock(context, id, keyblock) return krb5_fcc_write(context, id, (char *) keyblock->contents, keyblock->length); } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_addr(context, id, addr) krb5_context context; krb5_ccache id; @@ -175,7 +175,7 @@ krb5_fcc_store_addr(context, id, addr) } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_data(context, id, data) krb5_context context; krb5_ccache id; @@ -188,7 +188,7 @@ krb5_fcc_store_data(context, id, data) return krb5_fcc_write(context, id, data->data, data->length); } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_int32(context, id, i) krb5_context context; krb5_ccache id; @@ -213,7 +213,7 @@ krb5_fcc_store_int32(context, id, i) } } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_ui_2(context, id, i) krb5_context context; krb5_ccache id; @@ -236,7 +236,7 @@ krb5_fcc_store_ui_2(context, id, i) } } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_octet(context, id, i) krb5_context context; krb5_ccache id; @@ -248,7 +248,7 @@ krb5_fcc_store_octet(context, id, i) return krb5_fcc_write(context, id, (char *) &ibuf, 1); } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_times(context, id, t) krb5_context context; krb5_ccache id; @@ -273,7 +273,7 @@ krb5_fcc_store_times(context, id, t) } } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_authdata(context, id, a) krb5_context context; krb5_ccache id; @@ -297,7 +297,7 @@ krb5_fcc_store_authdata(context, id, a) return KRB5_OK; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_authdatum (context, id, a) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/stdio/ChangeLog b/src/lib/krb5/ccache/stdio/ChangeLog index 5fda9a6..f6f311f 100644 --- a/src/lib/krb5/ccache/stdio/ChangeLog +++ b/src/lib/krb5/ccache/stdio/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 16:32:12 1995 Keith Vetter (keithv@fusion.com) + + * scc_genn.c: __STDC__ conditional also checks the _WINDOWS define. + Sat Mar 25 14:42:37 1995 Tom Yu (tlyu@dragons-lair) * scc_maybe.c (krb5_scc_open_file): fixed typo (extra & in diff --git a/src/lib/krb5/ccache/stdio/scc_gennew.c b/src/lib/krb5/ccache/stdio/scc_gennew.c index 0172f4d..7e4e8db 100644 --- a/src/lib/krb5/ccache/stdio/scc_gennew.c +++ b/src/lib/krb5/ccache/stdio/scc_gennew.c @@ -86,7 +86,7 @@ krb5_scc_generate_new (context, id) strcpy(((krb5_scc_data *) lid->data)->filename, scratch); /* Make sure the file name is useable */ -#if defined(__STDC__) +#if defined(__STDC__) || defined(_WINDOWS) f = fopen (((krb5_scc_data *) lid->data)->filename, "wb+"); #else f = fopen (((krb5_scc_data *) lid->data)->filename, "w+"); diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog index 8938b0d..210218b 100644 --- a/src/lib/krb5/error_tables/ChangeLog +++ b/src/lib/krb5/error_tables/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 16:36:10 1995 Keith Vetter (keithv@fusion.com) + + * Makefile.in: clean target was cleaning too much for the PC. + Wed Apr 5 16:29:25 1995 Keith Vetter (keithv@fusion.com) * krb5_err.et: added KRB5_REALM_CANT_RESOLVE for more precise diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in index cbcbed0..a007cbe 100644 --- a/src/lib/krb5/error_tables/Makefile.in +++ b/src/lib/krb5/error_tables/Makefile.in @@ -70,9 +70,9 @@ kv5m_err.$(OBJEXT): kv5m_err.c clean:: clean-$(WHAT) -clean-unix:: +clean-unix:: clean-hdrs $(RM) $(HDRS) $(ETSRCS) -clean-mac: +clean-mac:: clean-hdrs $(RM) $(HDRS) $(ETSRCS) clean-windows:: @@ -84,7 +84,7 @@ includes:: $(HDRS) (set -x; rm -f $(EHDRDIR)/$$x; cp $$x $(EHDRDIR)/$$x) \ fi; done -clean:: +clean-hdrs:: for x in $(HDRS); do \ rm -f $(EHDRDIR)/$$x; \ done diff --git a/src/lib/krb5/free/ChangeLog b/src/lib/krb5/free/ChangeLog index ecc7923..6f444bb 100644 --- a/src/lib/krb5/free/ChangeLog +++ b/src/lib/krb5/free/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + Fri Mar 17 19:45:01 1995 John Gilmore (gnu at toad.com) * Makefile.in (LDFLAGS): Elim duplicate. diff --git a/src/lib/krb5/free/f_addr.c b/src/lib/krb5/free/f_addr.c index 6da52ac..d8f58b7 100644 --- a/src/lib/krb5/free/f_addr.c +++ b/src/lib/krb5/free/f_addr.c @@ -25,7 +25,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_address(context, val) krb5_context context; krb5_address *val; diff --git a/src/lib/krb5/free/f_ap_rep.c b/src/lib/krb5/free/f_ap_rep.c index 5d608b6..0301af1 100644 --- a/src/lib/krb5/free/f_ap_rep.c +++ b/src/lib/krb5/free/f_ap_rep.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_ap_rep(context, val) krb5_context context; register krb5_ap_rep *val; diff --git a/src/lib/krb5/free/f_ap_req.c b/src/lib/krb5/free/f_ap_req.c index 1990494..1b9a93a 100644 --- a/src/lib/krb5/free/f_ap_req.c +++ b/src/lib/krb5/free/f_ap_req.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_ap_req(context, val) krb5_context context; register krb5_ap_req *val; diff --git a/src/lib/krb5/free/f_auth_cnt.c b/src/lib/krb5/free/f_auth_cnt.c index be51d88..d061f26 100644 --- a/src/lib/krb5/free/f_auth_cnt.c +++ b/src/lib/krb5/free/f_auth_cnt.c @@ -27,7 +27,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_authenticator_contents(context, val) krb5_context context; krb5_authenticator *val; diff --git a/src/lib/krb5/free/f_authdata.c b/src/lib/krb5/free/f_authdata.c index ccaf918..fba8dd3 100644 --- a/src/lib/krb5/free/f_authdata.c +++ b/src/lib/krb5/free/f_authdata.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_authdata(context, val) krb5_context context; krb5_authdata **val; diff --git a/src/lib/krb5/free/f_authent.c b/src/lib/krb5/free/f_authent.c index 60ef901..f4d1c06 100644 --- a/src/lib/krb5/free/f_authent.c +++ b/src/lib/krb5/free/f_authent.c @@ -27,7 +27,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_authenticator(context, val) krb5_context context; krb5_authenticator *val; diff --git a/src/lib/krb5/free/f_chksum.c b/src/lib/krb5/free/f_chksum.c index 9149ce2..beab745 100644 --- a/src/lib/krb5/free/f_chksum.c +++ b/src/lib/krb5/free/f_chksum.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_checksum(context, val) krb5_context context; register krb5_checksum *val; diff --git a/src/lib/krb5/free/f_cred.c b/src/lib/krb5/free/f_cred.c index df6436c..7cc2a9a 100644 --- a/src/lib/krb5/free/f_cred.c +++ b/src/lib/krb5/free/f_cred.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_cred(context, val) krb5_context context; register krb5_cred *val; diff --git a/src/lib/krb5/free/f_cred_enc.c b/src/lib/krb5/free/f_cred_enc.c index 60e0b1e..d14b3d8 100644 --- a/src/lib/krb5/free/f_cred_enc.c +++ b/src/lib/krb5/free/f_cred_enc.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_cred_enc_part(context, val) krb5_context context; register krb5_cred_enc_part *val; diff --git a/src/lib/krb5/free/f_enc_kdc.c b/src/lib/krb5/free/f_enc_kdc.c index 20fa9a8..1022376 100644 --- a/src/lib/krb5/free/f_enc_kdc.c +++ b/src/lib/krb5/free/f_enc_kdc.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_enc_kdc_rep_part(context, val) krb5_context context; register krb5_enc_kdc_rep_part *val; diff --git a/src/lib/krb5/free/f_enc_tkt.c b/src/lib/krb5/free/f_enc_tkt.c index d2cddf0..3c2aa3a 100644 --- a/src/lib/krb5/free/f_enc_tkt.c +++ b/src/lib/krb5/free/f_enc_tkt.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_enc_tkt_part(context, val) krb5_context context; krb5_enc_tkt_part *val; diff --git a/src/lib/krb5/free/f_error.c b/src/lib/krb5/free/f_error.c index 29a0541..a24a6c4 100644 --- a/src/lib/krb5/free/f_error.c +++ b/src/lib/krb5/free/f_error.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_error(context, val) krb5_context context; register krb5_error *val; diff --git a/src/lib/krb5/free/f_kdc_rp.c b/src/lib/krb5/free/f_kdc_rp.c index 21fbb6c..aba2fff 100644 --- a/src/lib/krb5/free/f_kdc_rp.c +++ b/src/lib/krb5/free/f_kdc_rp.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_kdc_rep(context, val) krb5_context context; krb5_kdc_rep *val; diff --git a/src/lib/krb5/free/f_kdc_rq.c b/src/lib/krb5/free/f_kdc_rq.c index d8f1716..0e0ca64 100644 --- a/src/lib/krb5/free/f_kdc_rq.c +++ b/src/lib/krb5/free/f_kdc_rq.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_kdc_req(context, val) krb5_context context; krb5_kdc_req *val; diff --git a/src/lib/krb5/free/f_keyblock.c b/src/lib/krb5/free/f_keyblock.c index 6a513f1..6051657 100644 --- a/src/lib/krb5/free/f_keyblock.c +++ b/src/lib/krb5/free/f_keyblock.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_keyblock(context, val) krb5_context context; register krb5_keyblock *val; diff --git a/src/lib/krb5/free/f_last_req.c b/src/lib/krb5/free/f_last_req.c index 3e01f96..278b6f4 100644 --- a/src/lib/krb5/free/f_last_req.c +++ b/src/lib/krb5/free/f_last_req.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_last_req(context, val) krb5_context context; krb5_last_req_entry **val; diff --git a/src/lib/krb5/free/f_padata.c b/src/lib/krb5/free/f_padata.c index cd2af53..9540014 100644 --- a/src/lib/krb5/free/f_padata.c +++ b/src/lib/krb5/free/f_padata.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_pa_data(context, val) krb5_context context; krb5_pa_data **val; diff --git a/src/lib/krb5/free/f_priv.c b/src/lib/krb5/free/f_priv.c index 5a47f3e..0686142 100644 --- a/src/lib/krb5/free/f_priv.c +++ b/src/lib/krb5/free/f_priv.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_priv(context, val) krb5_context context; register krb5_priv *val; diff --git a/src/lib/krb5/free/f_priv_enc.c b/src/lib/krb5/free/f_priv_enc.c index 95dcde5..8e25602 100644 --- a/src/lib/krb5/free/f_priv_enc.c +++ b/src/lib/krb5/free/f_priv_enc.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_priv_enc_part(context, val) krb5_context context; register krb5_priv_enc_part *val; diff --git a/src/lib/krb5/free/f_pwd_data.c b/src/lib/krb5/free/f_pwd_data.c index 54240d2..2a92336 100644 --- a/src/lib/krb5/free/f_pwd_data.c +++ b/src/lib/krb5/free/f_pwd_data.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_pwd_data(context, val) krb5_context context; krb5_pwd_data *val; diff --git a/src/lib/krb5/free/f_pwd_seq.c b/src/lib/krb5/free/f_pwd_seq.c index 70da746..436fb68 100644 --- a/src/lib/krb5/free/f_pwd_seq.c +++ b/src/lib/krb5/free/f_pwd_seq.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_pwd_sequences(context, val) krb5_context context; passwd_phrase_element **val; diff --git a/src/lib/krb5/free/f_safe.c b/src/lib/krb5/free/f_safe.c index 9ca750e..11a3159 100644 --- a/src/lib/krb5/free/f_safe.c +++ b/src/lib/krb5/free/f_safe.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_safe(context, val) krb5_context context; register krb5_safe *val; diff --git a/src/lib/krb5/free/f_tckt.c b/src/lib/krb5/free/f_tckt.c index 94f26b3..8344345 100644 --- a/src/lib/krb5/free/f_tckt.c +++ b/src/lib/krb5/free/f_tckt.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_ticket(context, val) krb5_context context; krb5_ticket *val; diff --git a/src/lib/krb5/free/f_tckts.c b/src/lib/krb5/free/f_tckts.c index 89a7d7c..1a1af1e 100644 --- a/src/lib/krb5/free/f_tckts.c +++ b/src/lib/krb5/free/f_tckts.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_tickets(context, val) krb5_context context; krb5_ticket **val; diff --git a/src/lib/krb5/free/f_tgt_cred.c b/src/lib/krb5/free/f_tgt_cred.c index 0dbffd2..ddf7268 100644 --- a/src/lib/krb5/free/f_tgt_cred.c +++ b/src/lib/krb5/free/f_tgt_cred.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_tgt_creds(context, tgts) krb5_context context; krb5_creds **tgts; diff --git a/src/lib/krb5/free/f_tkt_auth.c b/src/lib/krb5/free/f_tkt_auth.c index 7aaf723..2ef99f4 100644 --- a/src/lib/krb5/free/f_tkt_auth.c +++ b/src/lib/krb5/free/f_tkt_auth.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_tkt_authent(context, val) krb5_context context; krb5_tkt_authent *val; diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog index d6b9d5f..97ee383 100644 --- a/src/lib/krb5/keytab/ChangeLog +++ b/src/lib/krb5/keytab/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.c: removed unneeded INTERFACE from non-api functions. + Fri Mar 17 19:46:07 1995 John Gilmore (gnu at toad.com) * Makefile.in (LDFLAGS): Zap duplicate defn. diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog index e224a9a..47da64d 100644 --- a/src/lib/krb5/keytab/file/ChangeLog +++ b/src/lib/krb5/keytab/file/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + Fri Mar 17 19:46:49 1995 John Gilmore (gnu at toad.com) * Makefile.in (LDFLAGS): Zap duplicate. diff --git a/src/lib/krb5/keytab/file/ktf_add.c b/src/lib/krb5/keytab/file/ktf_add.c index a1cad2a..0de7629 100644 --- a/src/lib/krb5/keytab/file/ktf_add.c +++ b/src/lib/krb5/keytab/file/ktf_add.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_add(context, id, entry) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_close.c b/src/lib/krb5/keytab/file/ktf_close.c index a59a796..93ee92e 100644 --- a/src/lib/krb5/keytab/file/ktf_close.c +++ b/src/lib/krb5/keytab/file/ktf_close.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_close(context, id) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_endget.c b/src/lib/krb5/keytab/file/ktf_endget.c index 714e4b7..25ef4de 100644 --- a/src/lib/krb5/keytab/file/ktf_endget.c +++ b/src/lib/krb5/keytab/file/ktf_endget.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_end_get(context, id, cursor) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_g_ent.c b/src/lib/krb5/keytab/file/ktf_g_ent.c index 591a887..a296720 100644 --- a/src/lib/krb5/keytab/file/ktf_g_ent.c +++ b/src/lib/krb5/keytab/file/ktf_g_ent.c @@ -29,7 +29,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_get_entry(context, id, principal, kvno, keytype, entry) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_g_name.c b/src/lib/krb5/keytab/file/ktf_g_name.c index 86f6159..a8f27c4 100644 --- a/src/lib/krb5/keytab/file/ktf_g_name.c +++ b/src/lib/krb5/keytab/file/ktf_g_name.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_get_name(context, id, name, len) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_next.c b/src/lib/krb5/keytab/file/ktf_next.c index eb3ecc3..da23bb9 100644 --- a/src/lib/krb5/keytab/file/ktf_next.c +++ b/src/lib/krb5/keytab/file/ktf_next.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_get_next(context, id, entry, cursor) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_remove.c b/src/lib/krb5/keytab/file/ktf_remove.c index b3ddd75..9370430 100644 --- a/src/lib/krb5/keytab/file/ktf_remove.c +++ b/src/lib/krb5/keytab/file/ktf_remove.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_remove(context, id, entry) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_resolv.c b/src/lib/krb5/keytab/file/ktf_resolv.c index bd304d9..e9e3827 100644 --- a/src/lib/krb5/keytab/file/ktf_resolv.c +++ b/src/lib/krb5/keytab/file/ktf_resolv.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_resolve(context, name, id) krb5_context context; const char *name; diff --git a/src/lib/krb5/keytab/file/ktf_ssget.c b/src/lib/krb5/keytab/file/ktf_ssget.c index b00a3f8..67e3bb6 100644 --- a/src/lib/krb5/keytab/file/ktf_ssget.c +++ b/src/lib/krb5/keytab/file/ktf_ssget.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_start_seq_get(context, id, cursorp) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_util.c b/src/lib/krb5/keytab/file/ktf_util.c index 84f3f0c..fa79ef0 100644 --- a/src/lib/krb5/keytab/file/ktf_util.c +++ b/src/lib/krb5/keytab/file/ktf_util.c @@ -160,7 +160,7 @@ int mode; return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_openr(context, id) krb5_context context; krb5_keytab id; @@ -168,7 +168,7 @@ krb5_keytab id; return krb5_ktfileint_open(context, id, KRB5_LOCKMODE_SHARED); } -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_openw(context, id) krb5_context context; krb5_keytab id; @@ -176,7 +176,7 @@ krb5_keytab id; return krb5_ktfileint_open(context, id, KRB5_LOCKMODE_EXCLUSIVE); } -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_close(context, id) krb5_context context; krb5_keytab id; @@ -191,7 +191,7 @@ krb5_keytab id; return kerror; } -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_delete_entry(context, id, delete_point) krb5_context context; krb5_keytab id; @@ -244,7 +244,7 @@ krb5_int32 delete_point; return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_internal_read_entry(context, id, ret_entry, delete_point) krb5_context context; krb5_keytab id; @@ -452,7 +452,7 @@ fail: return error; } -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_read_entry(context, id, entryp) krb5_context context; krb5_keytab id; @@ -463,7 +463,7 @@ krb5_keytab_entry *entryp; return krb5_ktfileint_internal_read_entry(context, id, entryp, &delete_point); } -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_write_entry(context, id, entry) krb5_context context; krb5_keytab id; @@ -609,7 +609,7 @@ krb5_keytab_entry *entry; * Determine the size needed for a file entry for the given * keytab entry. */ -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_size_entry(context, entry, size_needed) krb5_context context; krb5_keytab_entry *entry; @@ -651,7 +651,7 @@ krb5_int32 *size_needed; * to commit the write, but that this field must indicate the size of the * block in the file rather than the size of the actual entry) */ -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_find_slot(context, id, size_needed, commit_point) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_wreslv.c b/src/lib/krb5/keytab/file/ktf_wreslv.c index 7845a6b..684f8d5 100644 --- a/src/lib/krb5/keytab/file/ktf_wreslv.c +++ b/src/lib/krb5/keytab/file/ktf_wreslv.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_wresolve(context, name, id) krb5_context context; const char *name; diff --git a/src/lib/krb5/keytab/file/ktfile.h b/src/lib/krb5/keytab/file/ktfile.h index 4bb7e1d..c1c55dc 100644 --- a/src/lib/krb5/keytab/file/ktfile.h +++ b/src/lib/krb5/keytab/file/ktfile.h @@ -61,27 +61,27 @@ typedef struct _krb5_ktfile_data { extern struct _krb5_kt_ops krb5_ktf_ops; extern struct _krb5_kt_ops krb5_ktf_writable_ops; -krb5_error_code INTERFACE krb5_ktfile_resolve +krb5_error_code krb5_ktfile_resolve PROTOTYPE((krb5_context, const char *, krb5_keytab *)); -krb5_error_code INTERFACE krb5_ktfile_wresolve +krb5_error_code krb5_ktfile_wresolve PROTOTYPE((krb5_context, const char *, krb5_keytab *)); -krb5_error_code INTERFACE krb5_ktfile_get_name +krb5_error_code krb5_ktfile_get_name PROTOTYPE((krb5_context, krb5_keytab, char *, int)); -krb5_error_code INTERFACE krb5_ktfile_close +krb5_error_code krb5_ktfile_close PROTOTYPE((krb5_context, krb5_keytab)); -krb5_error_code INTERFACE krb5_ktfile_get_entry +krb5_error_code krb5_ktfile_get_entry PROTOTYPE((krb5_context, krb5_keytab, krb5_principal, @@ -89,72 +89,72 @@ krb5_error_code INTERFACE krb5_ktfile_get_entry krb5_keytype, krb5_keytab_entry *)); -krb5_error_code INTERFACE krb5_ktfile_start_seq_get +krb5_error_code krb5_ktfile_start_seq_get PROTOTYPE((krb5_context, krb5_keytab, krb5_kt_cursor *)); -krb5_error_code INTERFACE krb5_ktfile_get_next +krb5_error_code krb5_ktfile_get_next PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *, krb5_kt_cursor *)); -krb5_error_code INTERFACE krb5_ktfile_end_get +krb5_error_code krb5_ktfile_end_get PROTOTYPE((krb5_context, krb5_keytab, krb5_kt_cursor *)); /* routines to be included on extended version (write routines) */ -krb5_error_code INTERFACE krb5_ktfile_add +krb5_error_code krb5_ktfile_add PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *)); -krb5_error_code INTERFACE krb5_ktfile_remove +krb5_error_code krb5_ktfile_remove PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *)); -krb5_error_code INTERFACE krb5_ktfileint_openr +krb5_error_code krb5_ktfileint_openr PROTOTYPE((krb5_context, krb5_keytab)); -krb5_error_code INTERFACE krb5_ktfileint_openw +krb5_error_code krb5_ktfileint_openw PROTOTYPE((krb5_context, krb5_keytab)); -krb5_error_code INTERFACE krb5_ktfileint_close +krb5_error_code krb5_ktfileint_close PROTOTYPE((krb5_context, krb5_keytab)); -krb5_error_code INTERFACE krb5_ktfileint_read_entry +krb5_error_code krb5_ktfileint_read_entry PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *)); -krb5_error_code INTERFACE krb5_ktfileint_write_entry +krb5_error_code krb5_ktfileint_write_entry PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *)); -krb5_error_code INTERFACE krb5_ktfileint_delete_entry +krb5_error_code krb5_ktfileint_delete_entry PROTOTYPE((krb5_context, krb5_keytab, krb5_int32)); -krb5_error_code INTERFACE krb5_ktfileint_internal_read_entry +krb5_error_code krb5_ktfileint_internal_read_entry PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *, krb5_int32 *)); -krb5_error_code INTERFACE krb5_ktfileint_size_entry +krb5_error_code krb5_ktfileint_size_entry PROTOTYPE((krb5_context, krb5_keytab_entry *, krb5_int32 *)); -krb5_error_code INTERFACE krb5_ktfileint_find_slot +krb5_error_code krb5_ktfileint_find_slot PROTOTYPE((krb5_context, krb5_keytab, krb5_int32 *, diff --git a/src/lib/krb5/keytab/ktadd.c b/src/lib/krb5/keytab/ktadd.c index 7656c7e..56d3102 100644 --- a/src/lib/krb5/keytab/ktadd.c +++ b/src/lib/krb5/keytab/ktadd.c @@ -26,7 +26,7 @@ #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_kt_add_entry (context, id, entry) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c index 97ea1a0..4f9869d 100644 --- a/src/lib/krb5/keytab/ktbase.c +++ b/src/lib/krb5/keytab/ktbase.c @@ -39,7 +39,7 @@ static struct krb5_kt_typelist *kt_typehead = &krb5_kt_typelist_dfl; * don't replace if it already exists; return an error instead. */ -krb5_error_code INTERFACE +krb5_error_code krb5_kt_register(context, ops) krb5_context context; krb5_kt_ops *ops; @@ -68,7 +68,7 @@ krb5_kt_register(context, ops) * particular keytab type. */ -krb5_error_code INTERFACE +krb5_error_code krb5_kt_resolve (context, name, ktid) krb5_context context; const char *name; diff --git a/src/lib/krb5/keytab/ktdefault.c b/src/lib/krb5/keytab/ktdefault.c index 195d0ca..8681535 100644 --- a/src/lib/krb5/keytab/ktdefault.c +++ b/src/lib/krb5/keytab/ktdefault.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include <stdio.h> -krb5_error_code INTERFACE +krb5_error_code krb5_kt_default(context, id) krb5_context context; krb5_keytab *id; diff --git a/src/lib/krb5/keytab/ktfr_entry.c b/src/lib/krb5/keytab/ktfr_entry.c index e573d40..5aaa775 100644 --- a/src/lib/krb5/keytab/ktfr_entry.c +++ b/src/lib/krb5/keytab/ktfr_entry.c @@ -26,7 +26,7 @@ #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_kt_free_entry (context, entry) krb5_context context; krb5_keytab_entry *entry; diff --git a/src/lib/krb5/keytab/ktremove.c b/src/lib/krb5/keytab/ktremove.c index 928d6aa..377c4a0 100644 --- a/src/lib/krb5/keytab/ktremove.c +++ b/src/lib/krb5/keytab/ktremove.c @@ -26,7 +26,7 @@ #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_kt_remove_entry (context, id, entry) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/read_servi.c b/src/lib/krb5/keytab/read_servi.c index 90315dd..bd9331e 100644 --- a/src/lib/krb5/keytab/read_servi.c +++ b/src/lib/krb5/keytab/read_servi.c @@ -40,7 +40,7 @@ * returns: Either KSUCCESS or error code. * errors: error code if not found or keyprocarg is invalid. */ -krb5_error_code INTERFACE +krb5_error_code krb5_kt_read_service_key(context, keyprocarg, principal, vno, keytype, key) krb5_context context; krb5_pointer keyprocarg; diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index c591d11..7dd6e6a 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + Fri Mar 31 16:45:47 1995 Keith Vetter (keithv@fusion.com) * krb5_get_in_tkt: changed error return value for when clocks diff --git a/src/lib/krb5/krb/addr_comp.c b/src/lib/krb5/krb/addr_comp.c index f63ea02..661f696 100644 --- a/src/lib/krb5/krb/addr_comp.c +++ b/src/lib/krb5/krb/addr_comp.c @@ -29,7 +29,7 @@ /* * If the two addresses are the same, return TRUE, else return FALSE */ -krb5_boolean INTERFACE +krb5_boolean krb5_address_compare(context, addr1, addr2) krb5_context context; const krb5_address *addr1; diff --git a/src/lib/krb5/krb/addr_order.c b/src/lib/krb5/krb/addr_order.c index c872c52..757f7bf 100644 --- a/src/lib/krb5/krb/addr_order.c +++ b/src/lib/krb5/krb/addr_order.c @@ -34,7 +34,7 @@ * Return an ordering on two addresses: 0 if the same, * < 0 if first is less than 2nd, > 0 if first is greater than 2nd. */ -int INTERFACE +int krb5_address_order(context, addr1, addr2) krb5_context context; register const krb5_address *addr1; diff --git a/src/lib/krb5/krb/addr_srch.c b/src/lib/krb5/krb/addr_srch.c index 2e112ea..d30b68c 100644 --- a/src/lib/krb5/krb/addr_srch.c +++ b/src/lib/krb5/krb/addr_srch.c @@ -30,7 +30,7 @@ * if addr is listed in addrlist, or addrlist is null, return TRUE. * if not listed, return FALSE */ -krb5_boolean INTERFACE +krb5_boolean krb5_address_search(context, addr, addrlist) krb5_context context; const krb5_address *addr; diff --git a/src/lib/krb5/krb/auth_con.c b/src/lib/krb5/krb/auth_con.c index ebf72a7..134e07b 100644 --- a/src/lib/krb5/krb/auth_con.c +++ b/src/lib/krb5/krb/auth_con.c @@ -2,7 +2,7 @@ #include "k5-int.h" #include "auth_con.h" -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_init(context, auth_context) krb5_context context; krb5_auth_context ** auth_context; @@ -21,7 +21,7 @@ krb5_auth_con_init(context, auth_context) return ENOMEM; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_free(context, auth_context) krb5_context context; krb5_auth_context * auth_context; @@ -38,7 +38,7 @@ krb5_auth_con_free(context, auth_context) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_setaddrs(context, auth_context, local_addr, remote_addr) krb5_context context; krb5_auth_context * auth_context; @@ -51,7 +51,7 @@ krb5_auth_con_setaddrs(context, auth_context, local_addr, remote_addr) } /* XXX this call is a hack. Fixed when I do the servers. */ -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_setkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context * auth_context; @@ -69,7 +69,7 @@ krb5_auth_con_setkey(context, auth_context, keyblock) * Once decrypted this key is no longer necessary and is then overwritten * with the session key sent by the client. */ -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_setuseruserkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context * auth_context; @@ -80,7 +80,7 @@ krb5_auth_con_setuseruserkey(context, auth_context, keyblock) return(krb5_copy_keyblock(context, keyblock, &(auth_context->keyblock))); } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_getkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context * auth_context; @@ -92,7 +92,7 @@ krb5_auth_con_getkey(context, auth_context, keyblock) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_getlocalsubkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context * auth_context; @@ -104,7 +104,7 @@ krb5_auth_con_getlocalsubkey(context, auth_context, keyblock) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_getremotesubkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context * auth_context; @@ -116,7 +116,7 @@ krb5_auth_con_getremotesubkey(context, auth_context, keyblock) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_setcksumtype(context, auth_context, cksumtype) krb5_context context; krb5_auth_context * auth_context; @@ -126,7 +126,7 @@ krb5_auth_con_setcksumtype(context, auth_context, cksumtype) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_getlocalseqnumber(context, auth_context, seqnumber) krb5_context context; krb5_auth_context * auth_context; @@ -136,7 +136,7 @@ krb5_auth_con_getlocalseqnumber(context, auth_context, seqnumber) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_getauthenticator(context, auth_context, authenticator) krb5_context context; krb5_auth_context * auth_context; @@ -146,7 +146,7 @@ krb5_auth_con_getauthenticator(context, auth_context, authenticator) authenticator)); } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_getremoteseqnumber(context, auth_context, seqnumber) krb5_context context; krb5_auth_context * auth_context; @@ -156,7 +156,7 @@ krb5_auth_con_getremoteseqnumber(context, auth_context, seqnumber) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_initivector(context, auth_context) krb5_context context; krb5_auth_context * auth_context; @@ -174,7 +174,7 @@ krb5_auth_con_initivector(context, auth_context) return EINVAL; /* XXX need an error for no keyblock */ } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_setivector(context, auth_context, ivector) krb5_context context; krb5_auth_context * auth_context; @@ -184,7 +184,7 @@ krb5_auth_con_setivector(context, auth_context, ivector) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_getivector(context, auth_context, ivector) krb5_context context; krb5_auth_context * auth_context; @@ -194,7 +194,7 @@ krb5_auth_con_getivector(context, auth_context, ivector) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_setflags(context, auth_context, flags) krb5_context context; krb5_auth_context * auth_context; @@ -204,7 +204,7 @@ krb5_auth_con_setflags(context, auth_context, flags) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_setrcache(context, auth_context, rcache) krb5_context context; krb5_auth_context * auth_context; diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c index 289a0bf..d2dc469 100644 --- a/src/lib/krb5/krb/bld_princ.c +++ b/src/lib/krb5/krb/bld_princ.c @@ -33,7 +33,7 @@ #include <varargs.h> #endif -krb5_error_code INTERFACE_C +krb5_error_code krb5_build_principal_va(context, princ, rlen, realm, ap) krb5_context context; krb5_principal princ; @@ -96,7 +96,7 @@ krb5_build_principal_va(context, princ, rlen, realm, ap) return 0; } -krb5_error_code INTERFACE_C +krb5_error_code #ifdef HAVE_STDARG_H krb5_build_principal(krb5_context context, krb5_principal * princ, int rlen, const char * realm, ...) diff --git a/src/lib/krb5/krb/chk_trans.c b/src/lib/krb5/krb/chk_trans.c index 2159915..75794e8 100644 --- a/src/lib/krb5/krb/chk_trans.c +++ b/src/lib/krb5/krb/chk_trans.c @@ -25,7 +25,7 @@ #define MAX_REALM_LN 500 -krb5_error_code INTERFACE +krb5_error_code krb5_check_transited_list(context, trans, realm1, realm2) krb5_context context; krb5_data *trans; diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c index e1b90c9..e76bf9b 100644 --- a/src/lib/krb5/krb/conv_princ.c +++ b/src/lib/krb5/krb/conv_princ.c @@ -99,7 +99,7 @@ static char *strnchr(s, c, n) /* XXX This calls for a new error code */ #define KRB5_INVALID_PRINCIPAL KRB5_LNAME_BADFORMAT -krb5_error_code INTERFACE +krb5_error_code krb5_524_conv_principal(context, princ, name, inst, realm) krb5_context context; const krb5_principal princ; @@ -167,7 +167,7 @@ krb5_524_conv_principal(context, princ, name, inst, realm) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_425_conv_principal(context, name, instance, realm, princ) krb5_context context; const char *name; diff --git a/src/lib/krb5/krb/copy_addrs.c b/src/lib/krb5/krb/copy_addrs.c index 29c97ce..fa37731 100644 --- a/src/lib/krb5/krb/copy_addrs.c +++ b/src/lib/krb5/krb/copy_addrs.c @@ -49,7 +49,7 @@ krb5_address **outad; /* * Copy an address array, with fresh allocation. */ -krb5_error_code INTERFACE +krb5_error_code krb5_copy_addresses(context, inaddr, outaddr) krb5_context context; krb5_address * const * inaddr; @@ -87,7 +87,7 @@ krb5_copy_addresses(context, inaddr, outaddr) * Note that this function may change the value of *outaddr even if it * returns failure, but it will not change the contents of the list. */ -krb5_error_code INTERFACE +krb5_error_code krb5_append_addresses(context, inaddr, outaddr) krb5_context context; krb5_address * const * inaddr; diff --git a/src/lib/krb5/krb/copy_athctr.c b/src/lib/krb5/krb/copy_athctr.c index 826db0e..5523f31 100644 --- a/src/lib/krb5/krb/copy_athctr.c +++ b/src/lib/krb5/krb/copy_athctr.c @@ -26,7 +26,7 @@ #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_copy_authenticator(context, authfrom, authto) krb5_context context; const krb5_authenticator *authfrom; diff --git a/src/lib/krb5/krb/copy_auth.c b/src/lib/krb5/krb/copy_auth.c index 993d084..23c91dc 100644 --- a/src/lib/krb5/krb/copy_auth.c +++ b/src/lib/krb5/krb/copy_auth.c @@ -49,7 +49,7 @@ krb5_authdata **outad; /* * Copy an authdata array, with fresh allocation. */ -krb5_error_code INTERFACE +krb5_error_code krb5_copy_authdata(context, inauthdat, outauthdat) krb5_context context; krb5_authdata * const * inauthdat; diff --git a/src/lib/krb5/krb/copy_cksum.c b/src/lib/krb5/krb/copy_cksum.c index c7ebb8c..4d8d3ef 100644 --- a/src/lib/krb5/krb/copy_cksum.c +++ b/src/lib/krb5/krb/copy_cksum.c @@ -26,7 +26,7 @@ #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_copy_checksum(context, ckfrom, ckto) krb5_context context; const krb5_checksum *ckfrom; diff --git a/src/lib/krb5/krb/copy_creds.c b/src/lib/krb5/krb/copy_creds.c index 264ca51..1b58af9 100644 --- a/src/lib/krb5/krb/copy_creds.c +++ b/src/lib/krb5/krb/copy_creds.c @@ -30,7 +30,7 @@ * Copy credentials, allocating fresh storage where needed. */ -krb5_error_code INTERFACE +krb5_error_code krb5_copy_creds(context, incred, outcred) krb5_context context; const krb5_creds *incred; diff --git a/src/lib/krb5/krb/copy_data.c b/src/lib/krb5/krb/copy_data.c index fedf2dc..e9dd229 100644 --- a/src/lib/krb5/krb/copy_data.c +++ b/src/lib/krb5/krb/copy_data.c @@ -29,7 +29,7 @@ /* * Copy a data structure, with fresh allocation. */ -krb5_error_code INTERFACE +krb5_error_code krb5_copy_data(context, indata, outdata) krb5_context context; const krb5_data *indata; diff --git a/src/lib/krb5/krb/copy_key.c b/src/lib/krb5/krb/copy_key.c index 6e367d4..065b66e 100644 --- a/src/lib/krb5/krb/copy_key.c +++ b/src/lib/krb5/krb/copy_key.c @@ -29,7 +29,7 @@ /* * Copy a keyblock, including alloc'ed storage. */ -krb5_error_code INTERFACE +krb5_error_code krb5_copy_keyblock(context, from, to) krb5_context context; const krb5_keyblock *from; diff --git a/src/lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c index 4e7fb99..d8e47de 100644 --- a/src/lib/krb5/krb/copy_princ.c +++ b/src/lib/krb5/krb/copy_princ.c @@ -29,7 +29,7 @@ /* * Copy a principal structure, with fresh allocation. */ -krb5_error_code INTERFACE +krb5_error_code krb5_copy_principal(context, inprinc, outprinc) krb5_context context; krb5_const_principal inprinc; diff --git a/src/lib/krb5/krb/copy_tick.c b/src/lib/krb5/krb/copy_tick.c index b1e05e8..3d9b99a 100644 --- a/src/lib/krb5/krb/copy_tick.c +++ b/src/lib/krb5/krb/copy_tick.c @@ -91,7 +91,7 @@ krb5_copy_enc_tkt_part(context, partfrom, partto) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_copy_ticket(context, from, pto) krb5_context context; const krb5_ticket *from; diff --git a/src/lib/krb5/krb/cp_key_cnt.c b/src/lib/krb5/krb/cp_key_cnt.c index b4afc2e..fd32cae 100644 --- a/src/lib/krb5/krb/cp_key_cnt.c +++ b/src/lib/krb5/krb/cp_key_cnt.c @@ -29,7 +29,7 @@ /* * Copy a keyblock, including alloc'ed storage. */ -krb5_error_code INTERFACE +krb5_error_code krb5_copy_keyblock_contents(context, from, to) krb5_context context; const krb5_keyblock *from; diff --git a/src/lib/krb5/krb/decode_kdc.c b/src/lib/krb5/krb/decode_kdc.c index 007b2ab..642de5b 100644 --- a/src/lib/krb5/krb/decode_kdc.c +++ b/src/lib/krb5/krb/decode_kdc.c @@ -39,7 +39,7 @@ returns errors from encryption routines, system errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_decode_kdc_rep(context, enc_rep, key, etype, dec_rep) krb5_context context; krb5_data * enc_rep; diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c index 3307124..3777ffa 100644 --- a/src/lib/krb5/krb/decrypt_tk.c +++ b/src/lib/krb5/krb/decrypt_tk.c @@ -35,7 +35,7 @@ */ -krb5_error_code INTERFACE +krb5_error_code krb5_decrypt_tkt_part(context, srv_key, ticket) krb5_context context; const krb5_keyblock *srv_key; diff --git a/src/lib/krb5/krb/encode_kdc.c b/src/lib/krb5/krb/encode_kdc.c index 5b72dc4..a4d0edb 100644 --- a/src/lib/krb5/krb/encode_kdc.c +++ b/src/lib/krb5/krb/encode_kdc.c @@ -40,7 +40,7 @@ */ /* due to argument promotion rules, we need to use the DECLARG/OLDDECLARG stuff... */ -krb5_error_code INTERFACE +krb5_error_code krb5_encode_kdc_rep(context, type, encpart, eblock, client_key, dec_rep, enc_rep) krb5_context context; const krb5_msgtype type; diff --git a/src/lib/krb5/krb/encrypt_tk.c b/src/lib/krb5/krb/encrypt_tk.c index 65cbd74..101b6b7 100644 --- a/src/lib/krb5/krb/encrypt_tk.c +++ b/src/lib/krb5/krb/encrypt_tk.c @@ -38,7 +38,7 @@ enc_part->ciphertext.data allocated & filled in with encrypted stuff */ -krb5_error_code INTERFACE +krb5_error_code krb5_encrypt_tkt_part(context, eblock, srv_key, dec_ticket) krb5_context context; krb5_encrypt_block *eblock; diff --git a/src/lib/krb5/krb/faddr_ordr.c b/src/lib/krb5/krb/faddr_ordr.c index 1afb65a..6294993 100644 --- a/src/lib/krb5/krb/faddr_ordr.c +++ b/src/lib/krb5/krb/faddr_ordr.c @@ -34,7 +34,7 @@ * Return an ordering on the two full addresses: 0 if the same, * < 0 if first is less than 2nd, > 0 if first is greater than 2nd. */ -int INTERFACE +int krb5_fulladdr_order(context, addr1, addr2) krb5_context context; register const krb5_fulladdr *addr1; diff --git a/src/lib/krb5/krb/free_rtree.c b/src/lib/krb5/krb/free_rtree.c index b3b70e4..5849271 100644 --- a/src/lib/krb5/krb/free_rtree.c +++ b/src/lib/krb5/krb/free_rtree.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_realm_tree(context, realms) krb5_context context; krb5_principal *realms; diff --git a/src/lib/krb5/krb/gc_2tgt.c b/src/lib/krb5/krb/gc_2tgt.c index 5689f1e..9f9106f 100644 --- a/src/lib/krb5/krb/gc_2tgt.c +++ b/src/lib/krb5/krb/gc_2tgt.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "int-proto.h" -krb5_error_code INTERFACE +krb5_error_code krb5_get_cred_via_2tgt (context, tgt, kdcoptions, sumtype, in_cred, out_cred) krb5_context context; krb5_creds *tgt; diff --git a/src/lib/krb5/krb/gc_frm_kdc.c b/src/lib/krb5/krb/gc_frm_kdc.c index daf14ca..30e278d 100644 --- a/src/lib/krb5/krb/gc_frm_kdc.c +++ b/src/lib/krb5/krb/gc_frm_kdc.c @@ -63,7 +63,7 @@ extern krb5_cksumtype krb5_kdc_req_sumtype; #define TGT_ETYPE \ krb5_keytype_array[tgt.keyblock.keytype]->system->proto_enctype; -krb5_error_code INTERFACE +krb5_error_code krb5_get_cred_from_kdc(context, ccache, in_cred, out_cred, tgts) krb5_context context; krb5_ccache ccache; diff --git a/src/lib/krb5/krb/gc_via_tgt.c b/src/lib/krb5/krb/gc_via_tgt.c index de9dae5..c0d31c2 100644 --- a/src/lib/krb5/krb/gc_via_tgt.c +++ b/src/lib/krb5/krb/gc_via_tgt.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "int-proto.h" -krb5_error_code INTERFACE +krb5_error_code krb5_get_cred_via_tgt (context, tgt, kdcoptions, sumtype, in_cred, out_cred) krb5_context context; krb5_creds * tgt; diff --git a/src/lib/krb5/krb/gen_seqnum.c b/src/lib/krb5/krb/gen_seqnum.c index 4befc40..ec6e032 100644 --- a/src/lib/krb5/krb/gen_seqnum.c +++ b/src/lib/krb5/krb/gen_seqnum.c @@ -32,7 +32,7 @@ #define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif -krb5_error_code INTERFACE +krb5_error_code krb5_generate_seq_number(context, key, seqno) krb5_context context; const krb5_keyblock *key; diff --git a/src/lib/krb5/krb/gen_subkey.c b/src/lib/krb5/krb/gen_subkey.c index a326f2f..bd8ae4b 100644 --- a/src/lib/krb5/krb/gen_subkey.c +++ b/src/lib/krb5/krb/gen_subkey.c @@ -26,7 +26,7 @@ #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_generate_subkey(context, key, subkey) krb5_context context; const krb5_keyblock *key; diff --git a/src/lib/krb5/krb/get_fcreds.c b/src/lib/krb5/krb/get_fcreds.c index e0a2630..7c08022 100644 --- a/src/lib/krb5/krb/get_fcreds.c +++ b/src/lib/krb5/krb/get_fcreds.c @@ -39,7 +39,7 @@ #define flags2options(flags) (flags & KDC_TKT_COMMON_MASK) /* Get a TGT for use at the remote host */ -krb5_error_code INTERFACE +krb5_error_code krb5_get_for_creds(context, sumtype, rhost, client, enc_key, forwardable, outbuf) krb5_context context; diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 42dcdb4..ed34087 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -60,17 +60,17 @@ extern krb5_deltat krb5_clockskew; /* some typedef's for the function args to make things look a bit cleaner */ -typedef krb5_error_code (INTERFACE *git_key_proc) PROTOTYPE((krb5_context, +typedef krb5_error_code (*git_key_proc) PROTOTYPE((krb5_context, const krb5_keytype, krb5_data *, krb5_const_pointer, krb5_keyblock **)); -typedef krb5_error_code (INTERFACE *git_decrypt_proc) PROTOTYPE((krb5_context, +typedef krb5_error_code (*git_decrypt_proc) PROTOTYPE((krb5_context, const krb5_keyblock *, krb5_const_pointer, krb5_kdc_rep * )); -krb5_error_code INTERFACE +krb5_error_code krb5_get_in_tkt(context, options, addrs, etypes, ptypes, key_proc, keyseed, decrypt_proc, decryptarg, creds, ccache, ret_as_reply) krb5_context context; diff --git a/src/lib/krb5/krb/in_tkt_ktb.c b/src/lib/krb5/krb/in_tkt_ktb.c index 7b0858e..29701cc 100644 --- a/src/lib/krb5/krb/in_tkt_ktb.c +++ b/src/lib/krb5/krb/in_tkt_ktb.c @@ -37,14 +37,14 @@ struct keytab_keyproc_arg { * "keyseed" is actually a krb5_keytab, or NULL if we should fetch * from system area. */ -krb5_error_code INTERFACE keytab_keyproc +krb5_error_code keytab_keyproc PROTOTYPE((krb5_context, const krb5_keytype, krb5_data *, krb5_const_pointer, krb5_keyblock **)); -krb5_error_code INTERFACE +krb5_error_code keytab_keyproc(context, type, salt, keyseed, key) krb5_context context; const krb5_keytype type; @@ -107,7 +107,7 @@ keytab_keyproc(context, type, salt, keyseed, key) returns system errors, encryption errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_get_in_tkt_with_keytab(context, options, addrs, etypes, pre_auth_types, keytab, ccache, creds, ret_as_reply) krb5_context context; diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c index c288063..2c899bf 100644 --- a/src/lib/krb5/krb/in_tkt_pwd.c +++ b/src/lib/krb5/krb/in_tkt_pwd.c @@ -31,14 +31,14 @@ extern char *krb5_default_pwd_prompt1; /* * key-producing procedure for use by krb5_get_in_tkt_with_password. */ -krb5_error_code INTERFACE pwd_keyproc +krb5_error_code pwd_keyproc PROTOTYPE((krb5_context, const krb5_keytype, krb5_data *, krb5_const_pointer, krb5_keyblock **)); -krb5_error_code INTERFACE +krb5_error_code pwd_keyproc(context, type, salt, keyseed, key) krb5_context context; const krb5_keytype type; diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c index b8378e1..ab5d24c 100644 --- a/src/lib/krb5/krb/in_tkt_sky.c +++ b/src/lib/krb5/krb/in_tkt_sky.c @@ -37,14 +37,14 @@ struct skey_keyproc_arg { * "keyseed" is actually a krb5_keyblock *, or NULL if we should fetch * from system area. */ -krb5_error_code INTERFACE skey_keyproc +krb5_error_code skey_keyproc PROTOTYPE((krb5_context, const krb5_keytype, krb5_data *, krb5_const_pointer, krb5_keyblock **)); -krb5_error_code INTERFACE +krb5_error_code skey_keyproc(context, type, salt, keyseed, key) krb5_context context; const krb5_keytype type; @@ -94,7 +94,7 @@ skey_keyproc(context, type, salt, keyseed, key) returns system errors, encryption errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_get_in_tkt_with_skey(context, options, addrs, etypes, pre_auth_types, key, ccache, creds, ret_as_reply) krb5_context context; diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index d137c29..9daa66b 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -55,7 +55,7 @@ cleanup: return retval; } -void INTERFACE +void krb5_free_context(ctx) krb5_context ctx; { @@ -71,7 +71,7 @@ krb5_free_context(ctx) /* * Set the desired default etypes, making sure they are valid. */ -krb5_error_code INTERFACE +krb5_error_code krb5_set_default_in_tkt_etypes(context, etypes) krb5_context context; const krb5_enctype *etypes; @@ -110,7 +110,7 @@ krb5_set_default_in_tkt_etypes(context, etypes) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_get_default_in_tkt_etypes(context, etypes) krb5_context context; krb5_enctype **etypes; diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h index e8dafaf..0a08e39 100644 --- a/src/lib/krb5/krb/int-proto.h +++ b/src/lib/krb5/krb/int-proto.h @@ -28,19 +28,19 @@ #ifndef KRB5_INT_FUNC_PROTO__ #define KRB5_INT_FUNC_PROTO__ -krb5_error_code INTERFACE krb5_tgtname +krb5_error_code krb5_tgtname PROTOTYPE((krb5_context context, const krb5_data *, const krb5_data *, krb5_principal *)); -krb5_error_code INTERFACE krb5_get_cred_via_tgt +krb5_error_code krb5_get_cred_via_tgt PROTOTYPE((krb5_context context, krb5_creds *, const krb5_flags, const krb5_cksumtype, krb5_creds *, krb5_creds **)); -krb5_error_code INTERFACE krb5_get_cred_via_2tgt +krb5_error_code krb5_get_cred_via_2tgt PROTOTYPE((krb5_context context, krb5_creds *, const krb5_flags, diff --git a/src/lib/krb5/krb/kdc_rep_dc.c b/src/lib/krb5/krb/kdc_rep_dc.c index c2cdf12..881a587 100644 --- a/src/lib/krb5/krb/kdc_rep_dc.c +++ b/src/lib/krb5/krb/kdc_rep_dc.c @@ -33,7 +33,7 @@ */ /*ARGSUSED*/ -krb5_error_code INTERFACE +krb5_error_code krb5_kdc_rep_decrypt_proc(context, key, decryptarg, dec_rep) krb5_context context; const krb5_keyblock * key; diff --git a/src/lib/krb5/krb/mk_cred.c b/src/lib/krb5/krb/mk_cred.c index b432680..12df2c8 100644 --- a/src/lib/krb5/krb/mk_cred.c +++ b/src/lib/krb5/krb/mk_cred.c @@ -31,7 +31,7 @@ #include "k5-int.h" /* Create asn.1 encoded KRB-CRED message from the kdc reply. */ -krb5_error_code INTERFACE +krb5_error_code krb5_mk_cred(context, dec_rep, etype, key, sender_addr, recv_addr, outbuf) krb5_context context; krb5_kdc_rep *dec_rep; diff --git a/src/lib/krb5/krb/mk_error.c b/src/lib/krb5/krb/mk_error.c index 4f05e75..1e772e5 100644 --- a/src/lib/krb5/krb/mk_error.c +++ b/src/lib/krb5/krb/mk_error.c @@ -34,7 +34,7 @@ returns system errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_mk_error(context, dec_err, enc_err) krb5_context context; const krb5_error *dec_err; diff --git a/src/lib/krb5/krb/mk_priv.c b/src/lib/krb5/krb/mk_priv.c index 37cf62f..6a80491 100644 --- a/src/lib/krb5/krb/mk_priv.c +++ b/src/lib/krb5/krb/mk_priv.c @@ -133,7 +133,7 @@ clean_scratch: } -krb5_error_code INTERFACE +krb5_error_code krb5_mk_priv(context, auth_context, userdata, outbuf, outdata) krb5_context context; krb5_auth_context * auth_context; diff --git a/src/lib/krb5/krb/mk_rep.c b/src/lib/krb5/krb/mk_rep.c index b25e67c..9d5e81e 100644 --- a/src/lib/krb5/krb/mk_rep.c +++ b/src/lib/krb5/krb/mk_rep.c @@ -36,7 +36,7 @@ returns system errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_mk_rep(context, auth_context, outbuf) krb5_context context; krb5_auth_context * auth_context; diff --git a/src/lib/krb5/krb/mk_req.c b/src/lib/krb5/krb/mk_req.c index 3d86741..a9884a4 100644 --- a/src/lib/krb5/krb/mk_req.c +++ b/src/lib/krb5/krb/mk_req.c @@ -48,7 +48,7 @@ extern krb5_flags krb5_kdc_default_options; -krb5_error_code INTERFACE +krb5_error_code krb5_mk_req(context, auth_context, ap_req_options, service, hostname, in_data, ccache, outbuf) krb5_context context; diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c index 528973d..36670ed 100644 --- a/src/lib/krb5/krb/mk_safe.c +++ b/src/lib/krb5/krb/mk_safe.c @@ -117,7 +117,7 @@ cleanup_scratch: return retval; } -krb5_error_code INTERFACE +krb5_error_code krb5_mk_safe(context, auth_context, userdata, outbuf, outdata) krb5_context context; krb5_auth_context * auth_context; diff --git a/src/lib/krb5/krb/pr_to_salt.c b/src/lib/krb5/krb/pr_to_salt.c index 2c614d9..b8e9a1b 100644 --- a/src/lib/krb5/krb/pr_to_salt.c +++ b/src/lib/krb5/krb/pr_to_salt.c @@ -29,7 +29,7 @@ /* * Convert a krb5_principal into the default salt for that principal. */ -krb5_error_code INTERFACE +krb5_error_code krb5_principal2salt_internal(context, pr, ret, use_realm) krb5_context context; register krb5_const_principal pr; @@ -71,7 +71,7 @@ krb5_principal2salt_internal(context, pr, ret, use_realm) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_principal2salt(context, pr, ret) krb5_context context; register krb5_const_principal pr; @@ -80,7 +80,7 @@ krb5_principal2salt(context, pr, ret) return krb5_principal2salt_internal(context, pr, ret, 1); } -krb5_error_code INTERFACE +krb5_error_code krb5_principal2salt_norealm(context, pr, ret) krb5_context context; register krb5_const_principal pr; diff --git a/src/lib/krb5/krb/preauth.c b/src/lib/krb5/krb/preauth.c index 8beade6..00c17a9a 100644 --- a/src/lib/krb5/krb/preauth.c +++ b/src/lib/krb5/krb/preauth.c @@ -76,7 +76,7 @@ static krb5_error_code find_preauthenticator * * Note: This is a first crack at what any preauthentication will need... */ -krb5_error_code INTERFACE +krb5_error_code krb5_obtain_padata(context, type, client, src_addr, encrypt_key, ret_data) krb5_context context; int type; /*IN: Preauth type */ @@ -182,7 +182,7 @@ error_out: * Note: This is a first crack at what any preauthentication will need... */ -krb5_error_code INTERFACE +krb5_error_code krb5_verify_padata(context, data,client,src_addr, decrypt_key, req_id, flags) krb5_context context; krb5_pa_data *data; /*IN: padata */ @@ -307,7 +307,7 @@ find_preauthenticator(type, preauth) */ int seeded = 0 ; /* Used by srand below */ -krb5_error_code INTERFACE +krb5_error_code get_unixtime_padata(context, client, src_addr, pa_data) krb5_context context; krb5_principal client; @@ -344,7 +344,7 @@ get_unixtime_padata(context, client, src_addr, pa_data) return(0); } -krb5_error_code INTERFACE +krb5_error_code verify_unixtime_padata(context, client, src_addr, data) krb5_context context; krb5_principal client; @@ -379,7 +379,7 @@ verify_unixtime_padata(context, client, src_addr, data) #include "sdcli.h" #include "sdconf.c" -krb5_error_code INTERFACE +krb5_error_code verify_securid_padata(client, src_addr, data) krb5_principal client; krb5_address **src_addr; @@ -427,7 +427,7 @@ verify_securid_padata(client, src_addr, data) } } #else -krb5_error_code INTERFACE +krb5_error_code verify_securid_padata(context, client, src_addr, data) krb5_context context; krb5_principal client; @@ -451,7 +451,7 @@ static char *krb5_SecureId_prompt = "\nEnter Your SecurId Access Code Prepended */ static char *krb5_SecureId_prompt = "\nEnter Your SecurId Access Code Prepended with Your PIN\n (or a \'#\'if Your PIN is entered on the card keypad): "; -krb5_error_code INTERFACE +krb5_error_code get_securid_padata(context, client,src_addr,pa_data) krb5_context context; krb5_principal client; diff --git a/src/lib/krb5/krb/princ_comp.c b/src/lib/krb5/krb/princ_comp.c index 0ada4a2..35c5847 100644 --- a/src/lib/krb5/krb/princ_comp.c +++ b/src/lib/krb5/krb/princ_comp.c @@ -27,7 +27,7 @@ #include "k5-int.h" -krb5_boolean INTERFACE +krb5_boolean krb5_realm_compare(context, princ1, princ2) krb5_context context; krb5_const_principal princ1; @@ -43,7 +43,7 @@ krb5_realm_compare(context, princ1, princ2) return TRUE; } -krb5_boolean INTERFACE +krb5_boolean krb5_principal_compare(context, princ1, princ2) krb5_context context; krb5_const_principal princ1; diff --git a/src/lib/krb5/krb/rd_cred.c b/src/lib/krb5/krb/rd_cred.c index d8212e5..dfe774b 100644 --- a/src/lib/krb5/krb/rd_cred.c +++ b/src/lib/krb5/krb/rd_cred.c @@ -33,7 +33,7 @@ extern krb5_deltat krb5_clockskew; #define in_clock_skew(date) (labs((date)-currenttime) < krb5_clockskew) /* Decode the KRB-CRED message, and return creds */ -krb5_error_code INTERFACE +krb5_error_code krb5_rd_cred(context, inbuf, key, creds, sender_addr, recv_addr) krb5_context context; const krb5_data *inbuf; diff --git a/src/lib/krb5/krb/rd_error.c b/src/lib/krb5/krb/rd_error.c index 0b2d147..bf07539 100644 --- a/src/lib/krb5/krb/rd_error.c +++ b/src/lib/krb5/krb/rd_error.c @@ -36,7 +36,7 @@ * returns system errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_rd_error(context, enc_errbuf, dec_error) krb5_context context; const krb5_data *enc_errbuf; diff --git a/src/lib/krb5/krb/rd_priv.c b/src/lib/krb5/krb/rd_priv.c index 3aa6bd2..3c5a416 100644 --- a/src/lib/krb5/krb/rd_priv.c +++ b/src/lib/krb5/krb/rd_priv.c @@ -172,7 +172,7 @@ cleanup_privmsg:; return retval; } -krb5_error_code INTERFACE +krb5_error_code krb5_rd_priv(context, auth_context, inbuf, outbuf, outdata) krb5_context context; krb5_auth_context * auth_context; diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c index cd498a1..a2dfb3c 100644 --- a/src/lib/krb5/krb/rd_req.c +++ b/src/lib/krb5/krb/rd_req.c @@ -42,7 +42,7 @@ * returns system errors, encryption errors, replay errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_rd_req(context, auth_context, inbuf, server, keytab, ap_req_options, ticket) krb5_context context; diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c index 8555296..0cee98c 100644 --- a/src/lib/krb5/krb/rd_req_dec.c +++ b/src/lib/krb5/krb/rd_req_dec.c @@ -90,7 +90,7 @@ krb5_rd_req_decrypt_tkt_part(context, req, keytab) return retval; } -krb5_error_code INTERFACE +krb5_error_code krb5_rd_req_decoded(context, auth_context, req, server, keytab, ap_req_options, ticket) krb5_context context; diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c index aa5dd35..b7798c1 100644 --- a/src/lib/krb5/krb/rd_safe.c +++ b/src/lib/krb5/krb/rd_safe.c @@ -161,7 +161,7 @@ cleanup: return retval; } -krb5_error_code INTERFACE +krb5_error_code krb5_rd_safe(context, auth_context, inbuf, outbuf, outdata) krb5_context context; krb5_auth_context * auth_context; diff --git a/src/lib/krb5/krb/recvauth.c b/src/lib/krb5/krb/recvauth.c index 02c9e42..b8e384a 100644 --- a/src/lib/krb5/krb/recvauth.c +++ b/src/lib/krb5/krb/recvauth.c @@ -36,7 +36,7 @@ extern krb5_flags krb5_kdc_default_options; static char *sendauth_version = "KRB5_SENDAUTH_V1.0"; -krb5_error_code INTERFACE +krb5_error_code krb5_recvauth(context, auth_context, /* IN */ fd, appl_version, server, rc_type, flags, keytab, diff --git a/src/lib/krb5/krb/send_tgs.c b/src/lib/krb5/krb/send_tgs.c index f093c48..e1bd769 100644 --- a/src/lib/krb5/krb/send_tgs.c +++ b/src/lib/krb5/krb/send_tgs.c @@ -163,7 +163,7 @@ cleanup_scratch: return retval; } -krb5_error_code INTERFACE +krb5_error_code krb5_send_tgs(context, kdcoptions, timestruct, etypes, sumtype, sname, addrs, authorization_data, padata, second_ticket, in_cred, rep) krb5_context context; diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c index e71a749..1e890e8 100644 --- a/src/lib/krb5/krb/sendauth.c +++ b/src/lib/krb5/krb/sendauth.c @@ -39,7 +39,7 @@ extern krb5_flags krb5_kdc_default_options; static char *sendauth_version = "KRB5_SENDAUTH_V1.0"; -krb5_error_code INTERFACE +krb5_error_code krb5_sendauth(context, auth_context, /* IN */ fd, appl_version, client, server, ap_req_options, in_data, diff --git a/src/lib/krb5/krb/srv_rcache.c b/src/lib/krb5/krb/srv_rcache.c index 5675870..a253431 100644 --- a/src/lib/krb5/krb/srv_rcache.c +++ b/src/lib/krb5/krb/srv_rcache.c @@ -28,7 +28,7 @@ #include <ctype.h> #include <stdio.h> -krb5_error_code INTERFACE +krb5_error_code krb5_get_server_rcache(context, piece, rcptr) krb5_context context; const krb5_data *piece; diff --git a/src/lib/krb5/krb/tgtname.c b/src/lib/krb5/krb/tgtname.c index 98e17b4..5db4d98 100644 --- a/src/lib/krb5/krb/tgtname.c +++ b/src/lib/krb5/krb/tgtname.c @@ -28,7 +28,7 @@ /* This is an internal-only function, used by krb5_get_cred_from_kdc() */ -krb5_error_code INTERFACE +krb5_error_code krb5_tgtname(context, server, client, tgtprinc) krb5_context context; const krb5_data *server, *client; diff --git a/src/lib/krb5/krb/unparse.c b/src/lib/krb5/krb/unparse.c index 64823c5..d047a8b 100644 --- a/src/lib/krb5/krb/unparse.c +++ b/src/lib/krb5/krb/unparse.c @@ -54,7 +54,7 @@ #define REALM_SEP '@' #define COMPONENT_SEP '/' -krb5_error_code INTERFACE +krb5_error_code krb5_unparse_name_ext(context, principal, name, size) krb5_context context; krb5_const_principal principal; diff --git a/src/lib/krb5/krb/walk_rtree.c b/src/lib/krb5/krb/walk_rtree.c index e083738..3e3945b 100644 --- a/src/lib/krb5/krb/walk_rtree.c +++ b/src/lib/krb5/krb/walk_rtree.c @@ -34,7 +34,7 @@ #define max(x,y) ((x) > (y) ? (x) : (y)) #endif -krb5_error_code INTERFACE +krb5_error_code krb5_walk_realm_tree(context, client, server, tree, realm_branch_char) krb5_context context; const krb5_data *client, *server; diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index 75cb1dcb..f647257 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,8 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + * read_pwd.c: __STDC__ conditional also checks the _WINDOWS define. + Fri Apr 7 15:32:04 1995 Keith Vetter (keithv@fusion.com) * ccdefname.c: diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c index 01e3d41..cb11cfd 100644 --- a/src/lib/krb5/os/an_to_ln.c +++ b/src/lib/krb5/os/an_to_ln.c @@ -173,7 +173,7 @@ username_an_to_ln(context, aname, lnsize, lname) #ifdef _MSDOS -krb5_error_code INTERFACE +krb5_error_code krb5_aname_to_localname(context, aname, lnsize, lname) krb5_context context; krb5_const_principal aname; diff --git a/src/lib/krb5/os/ccdefname.c b/src/lib/krb5/os/ccdefname.c index dd20f17..fa794ca 100644 --- a/src/lib/krb5/os/ccdefname.c +++ b/src/lib/krb5/os/ccdefname.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include <stdio.h> -char * INTERFACE +char * krb5_cc_default_name(context) krb5_context context; { diff --git a/src/lib/krb5/os/free_hstrl.c b/src/lib/krb5/os/free_hstrl.c index 8314d44..f112041 100644 --- a/src/lib/krb5/os/free_hstrl.c +++ b/src/lib/krb5/os/free_hstrl.c @@ -31,7 +31,7 @@ Frees the storage taken by a realm list returned by krb5_get_local_realm. */ -krb5_error_code INTERFACE +krb5_error_code krb5_free_host_realm(context, realmlist) krb5_context context; char * const *realmlist; diff --git a/src/lib/krb5/os/free_krbhs.c b/src/lib/krb5/os/free_krbhs.c index 8b50a74..066acfc 100644 --- a/src/lib/krb5/os/free_krbhs.c +++ b/src/lib/krb5/os/free_krbhs.c @@ -30,7 +30,7 @@ Frees the storage taken by a host list returned by krb5_get_krbhst. */ -krb5_error_code INTERFACE +krb5_error_code krb5_free_krbhst(context, hostlist) krb5_context context; char * const *hostlist; diff --git a/src/lib/krb5/os/full_ipadr.c b/src/lib/krb5/os/full_ipadr.c index 7751064..41e6f1c 100644 --- a/src/lib/krb5/os/full_ipadr.c +++ b/src/lib/krb5/os/full_ipadr.c @@ -31,7 +31,7 @@ #include "os-proto.h" -krb5_error_code INTERFACE +krb5_error_code krb5_make_full_ipaddr(context, adr, port, outaddr) krb5_context context; krb5_int32 adr; diff --git a/src/lib/krb5/os/gen_port.c b/src/lib/krb5/os/gen_port.c index 3789759..a5eb91b 100644 --- a/src/lib/krb5/os/gen_port.c +++ b/src/lib/krb5/os/gen_port.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "os-proto.h" -krb5_error_code INTERFACE +krb5_error_code krb5_gen_portaddr(context, addr, ptr, outaddr) krb5_context context; const krb5_address *addr; diff --git a/src/lib/krb5/os/gen_rname.c b/src/lib/krb5/os/gen_rname.c index d4b933d..50c1724 100644 --- a/src/lib/krb5/os/gen_rname.c +++ b/src/lib/krb5/os/gen_rname.c @@ -29,7 +29,7 @@ #include "k5-int.h" #include "os-proto.h" -krb5_error_code INTERFACE +krb5_error_code krb5_gen_replay_name(context, address, uniq, string) krb5_context context; const krb5_address *address; diff --git a/src/lib/krb5/os/get_krbhst.c b/src/lib/krb5/os/get_krbhst.c index d41b80a..093af11 100644 --- a/src/lib/krb5/os/get_krbhst.c +++ b/src/lib/krb5/os/get_krbhst.c @@ -57,7 +57,7 @@ extern char *krb5_config_file; /* extern so can be set at load/runtime */ -krb5_error_code INTERFACE +krb5_error_code krb5_get_krbhst(context, realm, hostlist) krb5_context context; const krb5_data *realm; diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c index 89156ee..950e2d0 100644 --- a/src/lib/krb5/os/hst_realm.c +++ b/src/lib/krb5/os/hst_realm.c @@ -131,7 +131,7 @@ read_2str (FILE *fp, char *b1, int l1, char *b2, int l2) { #endif /* _WINDOWS */ -krb5_error_code INTERFACE +krb5_error_code krb5_get_host_realm(context, host, realmsp) krb5_context context; const char *host; diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c index 3f9599a..4c92c67 100644 --- a/src/lib/krb5/os/init_os_ctx.c +++ b/src/lib/krb5/os/init_os_ctx.c @@ -25,7 +25,7 @@ #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_os_init_context(ctx) krb5_context ctx; { @@ -45,7 +45,7 @@ krb5_os_init_context(ctx) return 0; } -void INTERFACE +void krb5_os_free_context(ctx) krb5_context ctx; { diff --git a/src/lib/krb5/os/krbfileio.c b/src/lib/krb5/os/krbfileio.c index 43d1247..5cc9538 100644 --- a/src/lib/krb5/os/krbfileio.c +++ b/src/lib/krb5/os/krbfileio.c @@ -51,7 +51,7 @@ static char *VersionID = "@(#)krbfileio.c 2 - 08/22/91"; # define OPEN_MODE_NOT_TRUSTWORTHY #endif -krb5_error_code INTERFACE +krb5_error_code krb5_create_secure_file(context, pathname) krb5_context context; const char * pathname; @@ -90,7 +90,7 @@ krb5_create_secure_file(context, pathname) } } -krb5_error_code INTERFACE +krb5_error_code krb5_sync_disk_file(context, fp) krb5_context context; FILE *fp; diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c index 3e9e13d..d6321eb 100644 --- a/src/lib/krb5/os/ktdefname.c +++ b/src/lib/krb5/os/ktdefname.c @@ -28,7 +28,7 @@ extern char *krb5_defkeyname; -krb5_error_code INTERFACE +krb5_error_code krb5_kt_default_name(context, name, namesize) krb5_context context; char *name; diff --git a/src/lib/krb5/os/kuserok.c b/src/lib/krb5/os/kuserok.c index 5a25e53..29573df 100644 --- a/src/lib/krb5/os/kuserok.c +++ b/src/lib/krb5/os/kuserok.c @@ -143,7 +143,7 @@ krb5_kuserok(context, principal, luser) * If the given Kerberos name "server" translates to the same name as "luser" * (using * krb5_aname_to_lname()), returns TRUE. */ -krb5_boolean INTERFACE +krb5_boolean krb5_kuserok(context, principal, luser) krb5_context context; krb5_principal principal; diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c index 61abc2c..cc49870 100644 --- a/src/lib/krb5/os/locate_kdc.c +++ b/src/lib/krb5/os/locate_kdc.c @@ -37,7 +37,7 @@ extern char *krb5_kdc_sec_udp_portname; * returns count of number of addresses found */ -krb5_error_code INTERFACE +krb5_error_code krb5_locate_kdc(context, realm, addr_pp, naddrs) krb5_context context; const krb5_data *realm; diff --git a/src/lib/krb5/os/lock_file.c b/src/lib/krb5/os/lock_file.c index a449da2..dfdd729 100644 --- a/src/lib/krb5/os/lock_file.c +++ b/src/lib/krb5/os/lock_file.c @@ -108,7 +108,7 @@ krb5_lock_file(context, filep, pathname, mode) } #else /* MSDOS or Macintosh */ -krb5_error_code INTERFACE +krb5_error_code krb5_lock_file(context, filep, pathname, mode) krb5_context context; FILE *filep; diff --git a/src/lib/krb5/os/net_read.c b/src/lib/krb5/os/net_read.c index 9b28896..8cd5d15 100644 --- a/src/lib/krb5/os/net_read.c +++ b/src/lib/krb5/os/net_read.c @@ -35,7 +35,7 @@ * XXX must not use non-blocking I/O */ -int INTERFACE +int krb5_net_read(context, fd, buf, len) krb5_context context; int fd; diff --git a/src/lib/krb5/os/net_write.c b/src/lib/krb5/os/net_write.c index 4885a81..f623d99 100644 --- a/src/lib/krb5/os/net_write.c +++ b/src/lib/krb5/os/net_write.c @@ -34,7 +34,7 @@ * XXX must not use non-blocking I/O */ -int INTERFACE +int krb5_net_write(context, fd, buf, len) krb5_context context; int fd; diff --git a/src/lib/krb5/os/os-proto.h b/src/lib/krb5/os/os-proto.h index e5f9826..f23bb66 100644 --- a/src/lib/krb5/os/os-proto.h +++ b/src/lib/krb5/os/os-proto.h @@ -28,7 +28,7 @@ #define KRB5_LIBOS_INT_PROTO__ #ifdef SOCK_DGRAM /* XXX hack... */ -krb5_error_code INTERFACE krb5_locate_kdc +krb5_error_code krb5_locate_kdc PROTOTYPE((krb5_context, const krb5_data *, struct sockaddr **, @@ -36,20 +36,20 @@ krb5_error_code INTERFACE krb5_locate_kdc #endif #ifdef KRB5_USE_INET -krb5_error_code INTERFACE krb5_unpack_full_ipaddr +krb5_error_code krb5_unpack_full_ipaddr PROTOTYPE((krb5_context, const krb5_address *, krb5_int32 *, krb5_int16 *)); #ifdef NARROW_PROTOTYPES -krb5_error_code INTERFACE krb5_make_full_ipaddr +krb5_error_code krb5_make_full_ipaddr PROTOTYPE((krb5_context, krb5_int32, krb5_int16, krb5_address **)); #else -krb5_error_code INTERFACE krb5_make_full_ipaddr +krb5_error_code krb5_make_full_ipaddr PROTOTYPE((krb5_context, krb5_int32, int, /* unsigned short promotes to signed diff --git a/src/lib/krb5/os/port2ip.c b/src/lib/krb5/os/port2ip.c index 7491727..531e61a 100644 --- a/src/lib/krb5/os/port2ip.c +++ b/src/lib/krb5/os/port2ip.c @@ -30,7 +30,7 @@ #ifdef KRB5_USE_INET #include "os-proto.h" -krb5_error_code INTERFACE +krb5_error_code krb5_unpack_full_ipaddr(context, inaddr, adr, port) krb5_context context; const krb5_address *inaddr; diff --git a/src/lib/krb5/os/read_msg.c b/src/lib/krb5/os/read_msg.c index bd9cb6e..a5dc796 100644 --- a/src/lib/krb5/os/read_msg.c +++ b/src/lib/krb5/os/read_msg.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include <errno.h> -krb5_error_code INTERFACE +krb5_error_code krb5_read_message(context, fdp, inbuf) krb5_context context; krb5_pointer fdp; diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c index 0c05359..0944e47 100644 --- a/src/lib/krb5/os/read_pwd.c +++ b/src/lib/krb5/os/read_pwd.c @@ -81,7 +81,7 @@ krb5_read_password(context, prompt, prompt2, return_pwd, size_return) int *size_return; { /* adapted from Kerberos v4 des/read_password.c */ -#if defined(__STDC__) || defined(mips) +#if defined(__STDC__) || defined(mips) || defined(_WINDOWS) /* readin_string is used after a longjmp, so must be volatile */ volatile #endif @@ -254,7 +254,7 @@ krb5_read_password(context, prompt, prompt2, return_pwd, size_return) /* Don't expect to be called, just define it for sanity and the linker. */ -krb5_error_code INTERFACE +krb5_error_code krb5_read_password(context, prompt, prompt2, return_pwd, size_return) krb5_context context; char *prompt; diff --git a/src/lib/krb5/os/realm_dom.c b/src/lib/krb5/os/realm_dom.c index 5b4c071..fcb0b55 100644 --- a/src/lib/krb5/os/realm_dom.c +++ b/src/lib/krb5/os/realm_dom.c @@ -101,7 +101,7 @@ read_2str (FILE *fp, char *b1, int l1, char *b2, int l2) { #endif /* _WINDOWS */ -krb5_error_code INTERFACE +krb5_error_code krb5_get_realm_domain(context, realm, domain) krb5_context context; const char *realm; diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c index f4fffee..c64320c 100644 --- a/src/lib/krb5/os/sendto_kdc.c +++ b/src/lib/krb5/os/sendto_kdc.c @@ -56,7 +56,7 @@ extern int krb5_max_skdc_timeout; extern int krb5_skdc_timeout_shift; extern int krb5_skdc_timeout_1; -krb5_error_code INTERFACE +krb5_error_code krb5_sendto_kdc (context, message, realm, reply) krb5_context context; const krb5_data * message; diff --git a/src/lib/krb5/os/unlck_file.c b/src/lib/krb5/os/unlck_file.c index 3e0b3b3..900073e 100644 --- a/src/lib/krb5/os/unlck_file.c +++ b/src/lib/krb5/os/unlck_file.c @@ -27,7 +27,7 @@ #include <stdio.h> #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_unlock_file(context, filep, pathname) krb5_context context; FILE *filep; diff --git a/src/lib/krb5/os/write_msg.c b/src/lib/krb5/os/write_msg.c index 85845c1..ec1ff01 100644 --- a/src/lib/krb5/os/write_msg.c +++ b/src/lib/krb5/os/write_msg.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include <errno.h> -krb5_error_code INTERFACE +krb5_error_code krb5_write_message(context, fdp, outbuf) krb5_context context; krb5_pointer fdp; diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog index c310a5e..7734a5d 100644 --- a/src/lib/krb5/posix/ChangeLog +++ b/src/lib/krb5/posix/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 16:44:55 1995 Keith Vetter (keithv@fusion.com) + + * syslog.c: __STDC__ conditional also checks the _WINDOWS define. + Tue Mar 28 18:46:55 1995 John Gilmore (gnu at toad.com) * configure.in (AC_REPLACE_FUNCS): Add getuid to the list. diff --git a/src/lib/krb5/posix/syslog.c b/src/lib/krb5/posix/syslog.c index 4e5510f..c605e88 100644 --- a/src/lib/krb5/posix/syslog.c +++ b/src/lib/krb5/posix/syslog.c @@ -33,8 +33,9 @@ * Modified to use UNIX domain IPC by Ralph Campbell */ -#ifndef _MSDOS -#ifdef __STDC__ +#ifndef _WINDOWS + +#if defined(__STDC__) || defined(_WINDOWS) #include <stdarg.h> #else #define const @@ -62,7 +63,7 @@ static int LogFacility = LOG_USER; /* default facility code */ void -#ifdef __STDC__ +#if defined(__STDC__) || defined(_WINDOWS) syslog(int pri, const char *fmt, ...) #else syslog(pri, fmt, va_alist) @@ -73,7 +74,7 @@ syslog(pri, fmt, va_alist) { va_list pvar; void vsyslog(); -#ifdef __STDC__ +#if defined(__STDC__) || defined(_WINDOWS) va_start(pvar, fmt); #else va_start(pvar); diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog index 0115021..b55c33e 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + Fri Mar 31 16:44:34 1995 Theodore Y. Ts'o (tytso@dcl) * rc_dfl.c (krb5_rc_dfl_expunage): Close the old, temporary reply diff --git a/src/lib/krb5/rcache/rc_base.c b/src/lib/krb5/rcache/rc_base.c index f7f9e44..1e53094 100644 --- a/src/lib/krb5/rcache/rc_base.c +++ b/src/lib/krb5/rcache/rc_base.c @@ -30,7 +30,7 @@ static struct krb5_rc_typelist *typehead = &krb5_rc_typelist_dfl; semaphore ex_typelist = 1; #endif -krb5_error_code INTERFACE krb5_rc_register_type(context, ops) +krb5_error_code krb5_rc_register_type(context, ops) krb5_context context; krb5_rc_ops *ops; { @@ -59,7 +59,7 @@ krb5_error_code INTERFACE krb5_rc_register_type(context, ops) return 0; } -krb5_error_code INTERFACE krb5_rc_resolve_type(context, id, type) +krb5_error_code krb5_rc_resolve_type(context, id, type) krb5_context context; krb5_rcache *id; char *type; @@ -80,14 +80,14 @@ krb5_error_code INTERFACE krb5_rc_resolve_type(context, id, type) return 0; } -char * INTERFACE krb5_rc_get_type(context, id) +char * krb5_rc_get_type(context, id) krb5_context context; krb5_rcache id; { return id->ops->type; } -char * INTERFACE krb5_rc_default_type(context) +char * krb5_rc_default_type(context) krb5_context context; { char *s; @@ -97,7 +97,7 @@ char * INTERFACE krb5_rc_default_type(context) return "dfl"; } -char * INTERFACE krb5_rc_default_name(context) +char * krb5_rc_default_name(context) krb5_context context; { char *s; @@ -107,7 +107,7 @@ char * INTERFACE krb5_rc_default_name(context) return (char *) 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_rc_default(context, id) krb5_context context; krb5_rcache *id; @@ -129,7 +129,7 @@ krb5_rc_default(context, id) } -krb5_error_code INTERFACE krb5_rc_resolve_full(context, id, string_name) +krb5_error_code krb5_rc_resolve_full(context, id, string_name) krb5_context context; krb5_rcache *id; char *string_name; diff --git a/src/lib/krb5/rcache/rc_conv.c b/src/lib/krb5/rcache/rc_conv.c index 2ba4fca..92cf77f 100644 --- a/src/lib/krb5/rcache/rc_conv.c +++ b/src/lib/krb5/rcache/rc_conv.c @@ -21,7 +21,7 @@ Local stuff: given auth, take important information and make rep; return -1 if failed */ -krb5_error_code INTERFACE +krb5_error_code krb5_auth_to_rep(context, auth, rep) krb5_context context; krb5_tkt_authent *auth; diff --git a/src/lib/krb5/rcache/rc_dfl.c b/src/lib/krb5/rcache/rc_dfl.c index aecbb37..120eaa5 100644 --- a/src/lib/krb5/rcache/rc_dfl.c +++ b/src/lib/krb5/rcache/rc_dfl.c @@ -165,14 +165,14 @@ static int store(context, id, rep) return CMP_HOHUM; } -char * INTERFACE krb5_rc_dfl_get_name(context, id) +char * krb5_rc_dfl_get_name(context, id) krb5_context context; krb5_rcache id; { return ((struct dfl_data *) (id->data))->name; } -krb5_error_code INTERFACE krb5_rc_dfl_get_span(context, id, lifespan) +krb5_error_code krb5_rc_dfl_get_span(context, id, lifespan) krb5_context context; krb5_rcache id; krb5_deltat *lifespan; @@ -181,7 +181,7 @@ krb5_error_code INTERFACE krb5_rc_dfl_get_span(context, id, lifespan) return 0; } -krb5_error_code INTERFACE krb5_rc_dfl_init(context, id, lifespan) +krb5_error_code krb5_rc_dfl_init(context, id, lifespan) krb5_context context; krb5_rcache id; krb5_deltat lifespan; @@ -200,7 +200,7 @@ krb5_deltat lifespan; return 0; } -krb5_error_code INTERFACE krb5_rc_dfl_close_no_free(context, id) +krb5_error_code krb5_rc_dfl_close_no_free(context, id) krb5_context context; krb5_rcache id; { @@ -225,7 +225,7 @@ krb5_error_code INTERFACE krb5_rc_dfl_close_no_free(context, id) return 0; } -krb5_error_code INTERFACE krb5_rc_dfl_close(context, id) +krb5_error_code krb5_rc_dfl_close(context, id) krb5_context context; krb5_rcache id; { @@ -234,7 +234,7 @@ krb5_error_code INTERFACE krb5_rc_dfl_close(context, id) return 0; } -krb5_error_code INTERFACE krb5_rc_dfl_destroy(context, id) +krb5_error_code krb5_rc_dfl_destroy(context, id) krb5_context context; krb5_rcache id; { @@ -245,7 +245,7 @@ krb5_rcache id; return krb5_rc_dfl_close(context, id); } -krb5_error_code INTERFACE krb5_rc_dfl_resolve(context, id, name) +krb5_error_code krb5_rc_dfl_resolve(context, id, name) krb5_context context; krb5_rcache id; char *name; @@ -292,7 +292,7 @@ cleanup: return retval; } -void INTERFACE krb5_rc_free_entry (context, rep) +void krb5_rc_free_entry (context, rep) krb5_context context; krb5_donot_replay **rep; { @@ -377,7 +377,7 @@ errout: -krb5_error_code INTERFACE krb5_rc_dfl_recover(context, id) +krb5_error_code krb5_rc_dfl_recover(context, id) krb5_context context; krb5_rcache id; { @@ -486,7 +486,7 @@ krb5_rc_io_store (context, t, rep) return ret; } -krb5_error_code INTERFACE krb5_rc_dfl_store(context, id, rep) +krb5_error_code krb5_rc_dfl_store(context, id, rep) krb5_context context; krb5_rcache id; krb5_donot_replay *rep; @@ -522,7 +522,7 @@ krb5_donot_replay *rep; return 0; } -krb5_error_code INTERFACE krb5_rc_dfl_expunge(context, id) +krb5_error_code krb5_rc_dfl_expunge(context, id) krb5_context context; krb5_rcache id; { diff --git a/src/lib/krb5/rcache/rc_dfl.h b/src/lib/krb5/rcache/rc_dfl.h index 0245ed0..6529b6d 100644 --- a/src/lib/krb5/rcache/rc_dfl.h +++ b/src/lib/krb5/rcache/rc_dfl.h @@ -15,41 +15,41 @@ extern krb5_rc_ops krb5_rc_dfl_ops; /* initialized to the following */ -krb5_error_code INTERFACE krb5_rc_dfl_init +krb5_error_code krb5_rc_dfl_init PROTOTYPE((krb5_context, krb5_rcache, krb5_deltat)); -krb5_error_code INTERFACE krb5_rc_dfl_recover +krb5_error_code krb5_rc_dfl_recover PROTOTYPE((krb5_context, krb5_rcache)); -krb5_error_code INTERFACE krb5_rc_dfl_destroy +krb5_error_code krb5_rc_dfl_destroy PROTOTYPE((krb5_context, krb5_rcache)); -krb5_error_code INTERFACE krb5_rc_dfl_close +krb5_error_code krb5_rc_dfl_close PROTOTYPE((krb5_context, krb5_rcache)); -krb5_error_code INTERFACE krb5_rc_dfl_store +krb5_error_code krb5_rc_dfl_store PROTOTYPE((krb5_context, krb5_rcache, krb5_donot_replay *)); -krb5_error_code INTERFACE krb5_rc_dfl_expunge +krb5_error_code krb5_rc_dfl_expunge PROTOTYPE((krb5_context, krb5_rcache)); -krb5_error_code INTERFACE krb5_rc_dfl_get_span +krb5_error_code krb5_rc_dfl_get_span PROTOTYPE((krb5_context, krb5_rcache, krb5_deltat *)); -char * INTERFACE krb5_rc_dfl_get_name +char * krb5_rc_dfl_get_name PROTOTYPE((krb5_context, krb5_rcache)); -krb5_error_code INTERFACE krb5_rc_dfl_resolve +krb5_error_code krb5_rc_dfl_resolve PROTOTYPE((krb5_context, krb5_rcache, char *)); -krb5_error_code INTERFACE krb5_rc_dfl_close_no_free +krb5_error_code krb5_rc_dfl_close_no_free PROTOTYPE((krb5_context, krb5_rcache)); -void INTERFACE krb5_rc_free_entry +void krb5_rc_free_entry PROTOTYPE((krb5_context, krb5_donot_replay **)); #endif diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c index 8d61d57..3bbd600 100644 --- a/src/lib/krb5/rcache/rc_io.c +++ b/src/lib/krb5/rcache/rc_io.c @@ -65,7 +65,7 @@ static void getdir() } } -krb5_error_code INTERFACE krb5_rc_io_creat (context, d, fn) +krb5_error_code krb5_rc_io_creat (context, d, fn) krb5_context context; krb5_rc_iostuff *d; char **fn; @@ -149,7 +149,7 @@ krb5_error_code INTERFACE krb5_rc_io_creat (context, d, fn) return 0; } -krb5_error_code INTERFACE krb5_rc_io_open (context, d, fn) +krb5_error_code krb5_rc_io_open (context, d, fn) krb5_context context; krb5_rc_iostuff *d; char *fn; @@ -227,7 +227,7 @@ krb5_error_code INTERFACE krb5_rc_io_open (context, d, fn) return 0; } -krb5_error_code INTERFACE krb5_rc_io_move (context, new, old) +krb5_error_code krb5_rc_io_move (context, new, old) krb5_context context; krb5_rc_iostuff *new; krb5_rc_iostuff *old; @@ -243,7 +243,7 @@ krb5_error_code INTERFACE krb5_rc_io_move (context, new, old) return 0; } -krb5_error_code INTERFACE krb5_rc_io_write (context, d, buf, num) +krb5_error_code krb5_rc_io_write (context, d, buf, num) krb5_context context; krb5_rc_iostuff *d; krb5_pointer buf; @@ -264,7 +264,7 @@ krb5_error_code INTERFACE krb5_rc_io_write (context, d, buf, num) return 0; } -krb5_error_code INTERFACE krb5_rc_io_sync (context, d) +krb5_error_code krb5_rc_io_sync (context, d) krb5_context context; krb5_rc_iostuff *d; { @@ -281,7 +281,7 @@ krb5_error_code INTERFACE krb5_rc_io_sync (context, d) return 0; } -krb5_error_code INTERFACE krb5_rc_io_read (context, d, buf, num) +krb5_error_code krb5_rc_io_read (context, d, buf, num) krb5_context context; krb5_rc_iostuff *d; krb5_pointer buf; @@ -300,7 +300,7 @@ krb5_error_code INTERFACE krb5_rc_io_read (context, d, buf, num) return 0; } -krb5_error_code INTERFACE krb5_rc_io_close (context, d) +krb5_error_code krb5_rc_io_close (context, d) krb5_context context; krb5_rc_iostuff *d; { @@ -311,7 +311,7 @@ krb5_error_code INTERFACE krb5_rc_io_close (context, d) return 0; } -krb5_error_code INTERFACE krb5_rc_io_destroy (context, d) +krb5_error_code krb5_rc_io_destroy (context, d) krb5_context context; krb5_rc_iostuff *d; { @@ -328,7 +328,7 @@ krb5_error_code INTERFACE krb5_rc_io_destroy (context, d) return 0; } -krb5_error_code INTERFACE krb5_rc_io_mark (context, d) +krb5_error_code krb5_rc_io_mark (context, d) krb5_context context; krb5_rc_iostuff *d; { @@ -336,7 +336,7 @@ krb5_error_code INTERFACE krb5_rc_io_mark (context, d) return 0; } -krb5_error_code INTERFACE krb5_rc_io_unmark (context, d) +krb5_error_code krb5_rc_io_unmark (context, d) krb5_context context; krb5_rc_iostuff *d; { @@ -344,7 +344,7 @@ krb5_error_code INTERFACE krb5_rc_io_unmark (context, d) return 0; } -long INTERFACE +long krb5_rc_io_size (context, d) krb5_context context; krb5_rc_iostuff *d; diff --git a/src/lib/krb5/rcache/rc_io.h b/src/lib/krb5/rcache/rc_io.h index 74df1a0..aa90961 100644 --- a/src/lib/krb5/rcache/rc_io.h +++ b/src/lib/krb5/rcache/rc_io.h @@ -27,44 +27,44 @@ krb5_rc_iostuff; /* first argument is always iostuff for result file */ -krb5_error_code INTERFACE krb5_rc_io_creat +krb5_error_code krb5_rc_io_creat PROTOTYPE((krb5_context, krb5_rc_iostuff *, char **)); -krb5_error_code INTERFACE krb5_rc_io_open +krb5_error_code krb5_rc_io_open PROTOTYPE((krb5_context, krb5_rc_iostuff *, char *)); -krb5_error_code INTERFACE krb5_rc_io_move +krb5_error_code krb5_rc_io_move PROTOTYPE((krb5_context, krb5_rc_iostuff *, krb5_rc_iostuff *)); -krb5_error_code INTERFACE krb5_rc_io_write +krb5_error_code krb5_rc_io_write PROTOTYPE((krb5_context, krb5_rc_iostuff *, krb5_pointer, int)); -krb5_error_code INTERFACE krb5_rc_io_read +krb5_error_code krb5_rc_io_read PROTOTYPE((krb5_context, krb5_rc_iostuff *, krb5_pointer, int)); -krb5_error_code INTERFACE krb5_rc_io_close +krb5_error_code krb5_rc_io_close PROTOTYPE((krb5_context, krb5_rc_iostuff *)); -krb5_error_code INTERFACE krb5_rc_io_destroy +krb5_error_code krb5_rc_io_destroy PROTOTYPE((krb5_context, krb5_rc_iostuff *)); -krb5_error_code INTERFACE krb5_rc_io_mark +krb5_error_code krb5_rc_io_mark PROTOTYPE((krb5_context, krb5_rc_iostuff *)); -krb5_error_code INTERFACE krb5_rc_io_unmark +krb5_error_code krb5_rc_io_unmark PROTOTYPE((krb5_context, krb5_rc_iostuff *)); -krb5_error_code INTERFACE krb5_rc_io_sync +krb5_error_code krb5_rc_io_sync PROTOTYPE((krb5_context, krb5_rc_iostuff *)); -long INTERFACE krb5_rc_io_size +long krb5_rc_io_size PROTOTYPE((krb5_context, krb5_rc_iostuff *)); #endif |