Makefile.in: Don't remove autoconf.h when doing a make clean; it's an

	autoconf generated file.

adm_proto.h, asn1.h, ext-proto.h, kdb.h, kdb_dbm.h, los-proto.h,
	preauth.c: Change PROTOTYPE -> KRB5_PROTOTYPE

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6112 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 58b03f9d519526e295db405182309a333d4ab3eb..dc7041862d6b17f81ad8d99f07aa948308f5503d 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jun 21 10:44:06 1995    <tytso@rsx-11.mit.edu>
+
+       * Makefile.in: Don't remove autoconf.h when doing a make clean;
+               it's an autoconf generated file.
+
+       * adm_proto.h, asn1.h, ext-proto.h, kdb.h, kdb_dbm.h, los-proto.h,
+               preauth.c: Change PROTOTYPE -> KRB5_PROTOTYPE
+
 Sat Jun 10 22:11:45 1995  Tom Yu  (tlyu@dragons-lair)
 
        * adm_proto.h: update krb5_auth_context stuff

diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 2052d43d3655d7daf0cc1f7b7c99963402a4974b..0bbb30b38c0e8435c37b9c1d0726a13bf86114db 100644 (file)
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -10,28 +10,19 @@ KRB5_HEADERS = adm.h adm_proto.h asn1.h ext-proto.h k5-config.h k5-errors.h \
 # these are installed here for the build from lib/krb5/error_tables but 
 # also need to be in the installed tree
 ET_HEADERS = adm_err.h asn1_err.h kdb5_err.h krb5_err.h
-BUILT_HEADERS = autoconf.h osconf.h
+BUILT_HEADERS = osconf.h
 
 all:: all-$(WHAT)
 
-all-unix:: $(BUILT_HEADERS)
-all-mac:: $(BUILT_HEADERS)
+all-unix:: autoconf.h $(BUILT_HEADERS)
+all-mac:: autoconf.h  $(BUILT_HEADERS)
 all-windows:
        copy stock\osconf.h osconf.h
        echo /* not used in windows */ > autoconf.h
 
-includes:: autoconf.h
-
-# Run a header through a preprocessor to generate an architecture/environment
-# specific header file.  note that unifdef's exit status will normally be 1,
-# indicating some adjustment of the file took place.
-
 autoconf.h: $(srcdir)/autoconf.h.in config.status
        $(SHELL) config.status
 
-clean::
-       $(RM) autoconf.h
-
 depend::
 
 install::

diff --git a/src/include/krb5/adm_proto.h b/src/include/krb5/adm_proto.h
index beeb056b2959b316dbec68d8f6cdefd6ae5efb2f..a8c59326139bcf0abe4ded1335b34ef5bf288733 100644 (file)
--- a/src/include/krb5/adm_proto.h
+++ b/src/include/krb5/adm_proto.h
@@ -38,7 +38,7 @@ typedef struct _krb5_db_entry krb5_db_entry;
 
 /* adm_conn.c */
 krb5_error_code INTERFACE krb5_adm_connect
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   char *,
                   char *,
                   char *,
@@ -48,7 +48,7 @@ krb5_error_code INTERFACE krb5_adm_connect
                   char *,
                   krb5_timestamp));
 void INTERFACE krb5_adm_disconnect
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   int *,
                   krb5_auth_context,
                   krb5_ccache));
@@ -56,7 +56,7 @@ void INTERFACE krb5_adm_disconnect
 #if ! defined(_WINDOWS)
 /* adm_kw_dec.c */
 krb5_error_code krb5_adm_proto_to_dbent
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_int32,
                   krb5_data *,
                   krb5_ui_4 *,
@@ -65,7 +65,7 @@ krb5_error_code krb5_adm_proto_to_dbent
 
 /* adm_kw_enc.c */
 krb5_error_code krb5_adm_dbent_to_proto
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_ui_4,
                   krb5_db_entry *,
                   char *,
@@ -75,45 +75,45 @@ krb5_error_code krb5_adm_dbent_to_proto
 
 /* adm_kt_dec.c */
 krb5_error_code krb5_adm_proto_to_ktent
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_int32,
                   krb5_data *,
                   krb5_keytab_entry *));
 
 /* adm_kt_enc.c */
 krb5_error_code krb5_adm_ktent_to_proto
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_keytab_entry *,
                   krb5_int32 *,
                   krb5_data **));
 
 /* adm_rw.c */
 void INTERFACE krb5_free_adm_data
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_int32,
                   krb5_data *));
 
 krb5_error_code INTERFACE krb5_send_adm_cmd
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_pointer,
                   krb5_auth_context,
                   krb5_int32,
                   krb5_data *));
 krb5_error_code krb5_send_adm_reply
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_pointer,
                   krb5_auth_context,
                   krb5_int32,
                   krb5_int32,
                   krb5_data *));
 krb5_error_code krb5_read_adm_cmd
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_pointer,
                   krb5_auth_context,
                   krb5_int32 *,
                   krb5_data **));
 krb5_error_code INTERFACE krb5_read_adm_reply
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_pointer,
                   krb5_auth_context,
                   krb5_int32 *,
@@ -122,10 +122,10 @@ krb5_error_code INTERFACE krb5_read_adm_reply
 
 /* logger.c */
 krb5_error_code krb5_klog_init
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   char *,
                   char *,
                   krb5_boolean));
-void krb5_klog_close PROTOTYPE((krb5_context));
-int krb5_klog_syslog PROTOTYPE((int, const char *, ...));
+void krb5_klog_close KRB5_PROTOTYPE((krb5_context));
+int krb5_klog_syslog KRB5_PROTOTYPE((int, const char *, ...));
 #endif /* KRB5_ADM_PROTO_H__ */

diff --git a/src/include/krb5/asn1.h b/src/include/krb5/asn1.h
index 89efd4cda2cb34c760f81c75f511584f8509c7d0..800f361dbc064c00270b335f8fd2a9057425e815 100644 (file)
--- a/src/include/krb5/asn1.h
+++ b/src/include/krb5/asn1.h
@@ -116,72 +116,72 @@
 */
 
 krb5_error_code encode_krb5_authenticator
-       PROTOTYPE((const krb5_authenticator *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_authenticator *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_ticket
-       PROTOTYPE((const krb5_ticket *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_ticket *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_encryption_key
-       PROTOTYPE((const krb5_keyblock *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_keyblock *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_enc_tkt_part
-       PROTOTYPE((const krb5_enc_tkt_part *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_enc_tkt_part *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_enc_kdc_rep_part
-       PROTOTYPE((const krb5_enc_kdc_rep_part *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_enc_kdc_rep_part *rep, krb5_data **code));
 
 /* yes, the translation is identical to that used for KDC__REP */ 
 krb5_error_code encode_krb5_as_rep
-       PROTOTYPE((const krb5_kdc_rep *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_kdc_rep *rep, krb5_data **code));
 
 /* yes, the translation is identical to that used for KDC__REP */ 
 krb5_error_code encode_krb5_tgs_rep
-       PROTOTYPE((const krb5_kdc_rep *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_kdc_rep *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_ap_req
-       PROTOTYPE((const krb5_ap_req *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_ap_req *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_ap_rep
-       PROTOTYPE((const krb5_ap_rep *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_ap_rep *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_ap_rep_enc_part
-       PROTOTYPE((const krb5_ap_rep_enc_part *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_ap_rep_enc_part *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_as_req
-       PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_tgs_req
-       PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_kdc_req_body
-       PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_safe
-       PROTOTYPE((const krb5_safe *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_safe *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_priv
-       PROTOTYPE((const krb5_priv *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_priv *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_enc_priv_part
-       PROTOTYPE((const krb5_priv_enc_part *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_priv_enc_part *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_cred
-       PROTOTYPE((const krb5_cred *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_cred *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_enc_cred_part
-       PROTOTYPE((const krb5_cred_enc_part *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_cred_enc_part *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_error
-       PROTOTYPE((const krb5_error *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_error *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_authdata
-       PROTOTYPE((const krb5_authdata **rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_authdata **rep, krb5_data **code));
 
 krb5_error_code encode_krb5_pwd_sequence
-       PROTOTYPE((const passwd_phrase_element *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const passwd_phrase_element *rep, krb5_data **code));
 
 krb5_error_code encode_krb5_pwd_data
-       PROTOTYPE((const krb5_pwd_data *rep, krb5_data **code));
+       KRB5_PROTOTYPE((const krb5_pwd_data *rep, krb5_data **code));
 
 /*************************************************************************
  * End of prototypes for krb5_encode.c
@@ -204,70 +204,70 @@ krb5_error_code encode_krb5_pwd_data
 */
 
 krb5_error_code decode_krb5_authenticator
-       PROTOTYPE((const krb5_data *code, krb5_authenticator **rep));
+       KRB5_PROTOTYPE((const krb5_data *code, krb5_authenticator **rep));
 
 krb5_error_code decode_krb5_ticket
-       PROTOTYPE((const krb5_data *code, krb5_ticket **rep));
+       KRB5_PROTOTYPE((const krb5_data *code, krb5_ticket **rep));
 
 krb5_error_code decode_krb5_encryption_key
-       PROTOTYPE((const krb5_data *output, krb5_keyblock **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_keyblock **rep));
 
 krb5_error_code decode_krb5_enc_tkt_part
-       PROTOTYPE((const krb5_data *output, krb5_enc_tkt_part **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_enc_tkt_part **rep));
 
 krb5_error_code decode_krb5_enc_kdc_rep_part
-       PROTOTYPE((const krb5_data *output, krb5_enc_kdc_rep_part **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_enc_kdc_rep_part **rep));
 
 krb5_error_code decode_krb5_as_rep
-       PROTOTYPE((const krb5_data *output, krb5_kdc_rep **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_kdc_rep **rep));
 
 krb5_error_code decode_krb5_tgs_rep
-       PROTOTYPE((const krb5_data *output, krb5_kdc_rep **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_kdc_rep **rep));
 
 krb5_error_code decode_krb5_ap_req
-       PROTOTYPE((const krb5_data *output, krb5_ap_req **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_ap_req **rep));
 
 krb5_error_code decode_krb5_ap_rep
-       PROTOTYPE((const krb5_data *output, krb5_ap_rep **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_ap_rep **rep));
 
 krb5_error_code decode_krb5_ap_rep_enc_part
-       PROTOTYPE((const krb5_data *output, krb5_ap_rep_enc_part **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_ap_rep_enc_part **rep));
 
 krb5_error_code decode_krb5_as_req
-       PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep));
 
 krb5_error_code decode_krb5_tgs_req
-       PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep));
 
 krb5_error_code decode_krb5_kdc_req_body
-       PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep));
 
 krb5_error_code decode_krb5_safe
-       PROTOTYPE((const krb5_data *output, krb5_safe **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_safe **rep));
 
 krb5_error_code decode_krb5_priv
-       PROTOTYPE((const krb5_data *output, krb5_priv **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_priv **rep));
 
 krb5_error_code decode_krb5_enc_priv_part
-       PROTOTYPE((const krb5_data *output, krb5_priv_enc_part **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_priv_enc_part **rep));
 
 krb5_error_code decode_krb5_cred
-       PROTOTYPE((const krb5_data *output, krb5_cred **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_cred **rep));
 
 krb5_error_code decode_krb5_enc_cred_part
-       PROTOTYPE((const krb5_data *output, krb5_cred_enc_part **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_cred_enc_part **rep));
 
 krb5_error_code decode_krb5_error
-       PROTOTYPE((const krb5_data *output, krb5_error **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_error **rep));
 
 krb5_error_code decode_krb5_authdata
-       PROTOTYPE((const krb5_data *output, krb5_authdata ***rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_authdata ***rep));
 
 krb5_error_code decode_krb5_pwd_sequence
-       PROTOTYPE((const krb5_data *output, passwd_phrase_element **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, passwd_phrase_element **rep));
 
 krb5_error_code decode_krb5_pwd_data
-       PROTOTYPE((const krb5_data *output, krb5_pwd_data **rep));
+       KRB5_PROTOTYPE((const krb5_data *output, krb5_pwd_data **rep));
 
 /*************************************************************************
  * End of prototypes for krb5_decode.c

diff --git a/src/include/krb5/ext-proto.h b/src/include/krb5/ext-proto.h
index d6919dc1a9f9e748490400dbca2684975f5098d6..878c60e44e7ce496be79661999b301d3042f2ced 100644 (file)
--- a/src/include/krb5/ext-proto.h
+++ b/src/include/krb5/ext-proto.h
@@ -50,7 +50,7 @@ extern char *getenv();
 #endif
 
 #ifndef HAS_STRDUP
-extern char *strdup PROTOTYPE((const char *));
+extern char *strdup KRB5_PROTOTYPE((const char *));
 #endif
 
 #ifdef HAS_UNISTD_H

diff --git a/src/include/krb5/kdb.h b/src/include/krb5/kdb.h
index d0622d4c0eac1dcdc008b745ec5601b3c954c7c1..7b439704c290c9dc5dd1a0c775224c6ae6b5bc7d 100644 (file)
--- a/src/include/krb5/kdb.h
+++ b/src/include/krb5/kdb.h
@@ -114,86 +114,86 @@ extern char *krb5_mkey_pwd_prompt2;
 
 /* libkdb.spec */
 krb5_error_code krb5_db_set_name
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   char * ));
 krb5_error_code krb5_db_init
-       PROTOTYPE((krb5_context));
+       KRB5_PROTOTYPE((krb5_context));
 krb5_error_code krb5_db_fini
-       PROTOTYPE((krb5_context));
+       KRB5_PROTOTYPE((krb5_context));
 krb5_error_code krb5_db_get_age
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   char *,
                   time_t * ));
 krb5_error_code krb5_db_create
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   char * ));
 krb5_error_code krb5_db_rename
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   char *,
                   char * ));
 krb5_error_code krb5_db_get_principal
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_principal ,
                   krb5_db_entry *,
                   int *,
                   krb5_boolean * ));
 void krb5_db_free_principal
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_db_entry *,
                   int  ));
 krb5_error_code krb5_db_put_principal
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_db_entry *,
                   int * ));
 krb5_error_code krb5_db_delete_principal
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_principal,
                   int * ));
 krb5_error_code krb5_db_iterate
-       PROTOTYPE((krb5_context,
-                  krb5_error_code (* ) PROTOTYPE((krb5_pointer,
+       KRB5_PROTOTYPE((krb5_context,
+                  krb5_error_code (* ) KRB5_PROTOTYPE((krb5_pointer,
                                                   krb5_db_entry *)),
                   krb5_pointer ));
 krb5_error_code krb5_db_verify_master_key
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_principal, 
                   krb5_keyblock *, 
                   krb5_encrypt_block *));
 krb5_error_code krb5_db_store_mkey 
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   char *,
                   krb5_principal,
                   krb5_keyblock *));
 krb5_error_code krb5_kdb_encrypt_key
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_encrypt_block *,
                   const krb5_keyblock *,
                   krb5_encrypted_keyblock *));
 krb5_error_code krb5_kdb_decrypt_key
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_encrypt_block *,
                   const krb5_encrypted_keyblock *,
                   krb5_keyblock *));
 krb5_error_code krb5_db_setup_mkey_name
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   const char *, 
                   const char *, 
                   char **, 
                   krb5_principal *));
 krb5_error_code krb5_db_lock
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   int ));
 krb5_error_code krb5_db_unlock
-       PROTOTYPE((krb5_context));
+       KRB5_PROTOTYPE((krb5_context));
 krb5_error_code krb5_db_set_nonblocking
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_boolean,
                   krb5_boolean * ));
 krb5_boolean krb5_db_set_lockmode
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_boolean));
 krb5_error_code        krb5_db_fetch_mkey
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_principal, 
                   krb5_encrypt_block *, 
                   krb5_boolean,

diff --git a/src/include/krb5/kdb_dbm.h b/src/include/krb5/kdb_dbm.h
index 628ca73913c8b8c999f7d45f7748b69ed9a14de9..958853e892eab15768062eea2d7fdcd7de3d2807 100644 (file)
--- a/src/include/krb5/kdb_dbm.h
+++ b/src/include/krb5/kdb_dbm.h
@@ -58,55 +58,55 @@
 
 /* libkdb.spec */
 krb5_error_code krb5_dbm_db_set_name 
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   char * ));
 krb5_error_code krb5_dbm_db_init 
-       PROTOTYPE((krb5_context));
+       KRB5_PROTOTYPE((krb5_context));
 krb5_error_code krb5_dbm_db_fini 
-       PROTOTYPE((krb5_context));
+       KRB5_PROTOTYPE((krb5_context));
 krb5_error_code krb5_dbm_db_get_age 
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   char *,
                   time_t * ));
 krb5_error_code krb5_dbm_db_create 
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   char * ));
 krb5_error_code krb5_dbm_db_destroy 
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   char * ));
 krb5_error_code krb5_dbm_db_rename 
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   char *,
                   char * ));
 krb5_error_code krb5_dbm_db_get_principal 
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_principal,
                   krb5_db_entry *,
                   int *,
                   krb5_boolean * ));
 void krb5_dbm_db_free_principal 
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_db_entry *,
                   int ));
 krb5_error_code krb5_dbm_db_put_principal 
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_db_entry *,
                   int * ));
 krb5_error_code krb5_dbm_db_iterate
-       PROTOTYPE((krb5_context,
-                  krb5_error_code (*) PROTOTYPE((krb5_pointer,
+       KRB5_PROTOTYPE((krb5_context,
+                  krb5_error_code (*) KRB5_PROTOTYPE((krb5_pointer,
                                                  krb5_db_entry *)),
                   krb5_pointer ));
 krb5_error_code krb5_dbm_db_set_nonblocking 
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_boolean,
                   krb5_boolean * ));
 krb5_boolean krb5_dbm_db_set_lockmode
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_boolean ));
 krb5_error_code krb5_dbm_db_open_database 
-       PROTOTYPE((krb5_context));
+       KRB5_PROTOTYPE((krb5_context));
 krb5_error_code krb5_dbm_db_close_database 
-       PROTOTYPE((krb5_context));
+       KRB5_PROTOTYPE((krb5_context));
 
 #endif /* KRB5_KDB5_DBM__ */

diff --git a/src/include/krb5/los-proto.h b/src/include/krb5/los-proto.h
index 237a591f8aca6e7ed6c402fc773543b5c05583cb..ae3384e9714b68f0eaf2e7eed9b233e520a32c21 100644 (file)
--- a/src/include/krb5/los-proto.h
+++ b/src/include/krb5/los-proto.h
@@ -31,106 +31,106 @@
 
 /* libos.spec */
 krb5_error_code krb5_read_password
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   const char *,
                   const char *,
                   char *,
                   int * ));
 krb5_error_code krb5_lock_file
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   FILE *,
                   char *,
                   int  ));
 krb5_error_code krb5_unlock_file
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   FILE *,
                   char * ));
 int krb5_net_read
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   int ,
                   char *,
                   int  ));
 int krb5_net_write
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   int ,
                   const char *,
                   int  ));
 krb5_error_code krb5_sendto_kdc
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   const krb5_data *,
                   const krb5_data *,
                   krb5_data * ));
 krb5_error_code krb5_get_krbhst
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   const krb5_data *,
                   char *** ));
 krb5_error_code krb5_free_krbhst
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   char * const * ));
 krb5_error_code krb5_aname_to_localname
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_const_principal,
                   const int,
                   char * ));
 krb5_error_code krb5_get_host_realm
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   const char *,
                   char *** ));
 krb5_error_code krb5_free_host_realm
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   char * const * ));
 krb5_error_code krb5_get_realm_domain
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   const char *,
                   char ** ));
 krb5_boolean krb5_kuserok
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_principal, const char *));
 krb5_error_code krb5_random_confounder
-       PROTOTYPE((int,
+       KRB5_PROTOTYPE((int,
                   krb5_pointer ));
 krb5_error_code krb5_gen_replay_name
-    PROTOTYPE((krb5_context,
+    KRB5_PROTOTYPE((krb5_context,
                   const krb5_address *,
               const char *,
               char **));
 krb5_error_code krb5_gen_portaddr
-    PROTOTYPE((krb5_context,
+    KRB5_PROTOTYPE((krb5_context,
                   const krb5_address *,
               krb5_const_pointer,
               krb5_address **));
 krb5_error_code krb5_create_secure_file
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   const char * pathname));
 krb5_error_code krb5_sync_disk_file
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   FILE *fp));
 
 
 krb5_error_code krb5_read_message 
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_pointer, 
                   krb5_data *));
 krb5_error_code krb5_write_message 
-       PROTOTYPE((krb5_context,
+       KRB5_PROTOTYPE((krb5_context,
                   krb5_pointer, 
                   krb5_data *));
 
 krb5_error_code krb5_os_init_context
-        PROTOTYPE((krb5_context));
+        KRB5_PROTOTYPE((krb5_context));
 
 void krb5_os_free_context
-        PROTOTYPE((krb5_context));
+        KRB5_PROTOTYPE((krb5_context));
 
 krb5_error_code krb5_find_config_files
-        PROTOTYPE(());
+        KRB5_PROTOTYPE(());
 
 krb5_error_code krb5_make_fulladdr
-    PROTOTYPE((krb5_context,
+    KRB5_PROTOTYPE((krb5_context,
               krb5_address *,
               krb5_address *,
               krb5_address *));
 
-time_t gmt_mktime PROTOTYPE((struct tm *));
+time_t gmt_mktime KRB5_PROTOTYPE((struct tm *));
 
 #endif /* KRB5_LIBOS_PROTO__ */

diff --git a/src/include/krb5/preauth.h b/src/include/krb5/preauth.h
index a22e196b8f48eea6be0ba1ed222b17bd5b415de2..b7f95eb988f94dc3a28e21e0b6b4cf39e293db9f 100644 (file)
--- a/src/include/krb5/preauth.h
+++ b/src/include/krb5/preauth.h
@@ -36,11 +36,11 @@
  * Note: these typedefs are subject to change.... [tytso:19920903.1609EDT]
  */
 typedef krb5_error_code (krb5_preauth_obtain_proc)
-    PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
+    KRB5_PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
               krb5_pa_data *pa_data));
 
 typedef krb5_error_code (krb5_preauth_verify_proc)
-    PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
+    KRB5_PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
               krb5_data *data));
 
 typedef struct _krb5_preauth_ops {
@@ -59,28 +59,28 @@ typedef struct _krb5_preauth_ops {
 
 #if 0
 krb5_error_code get_random_padata
-    PROTOTYPE((krb5_principal client, krb5_address **src_addr,
+    KRB5_PROTOTYPE((krb5_principal client, krb5_address **src_addr,
               krb5_pa_data *data));
 
 krb5_error_code verify_random_padata
-    PROTOTYPE((krb5_principal client, krb5_address **src_addr,
+    KRB5_PROTOTYPE((krb5_principal client, krb5_address **src_addr,
               krb5_data *data));
 #endif
 
 krb5_error_code get_unixtime_padata
-    PROTOTYPE((krb5_context, krb5_principal client, 
+    KRB5_PROTOTYPE((krb5_context, krb5_principal client, 
               krb5_address **src_addr, krb5_pa_data *data));
 
 krb5_error_code verify_unixtime_padata
-    PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
+    KRB5_PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
               krb5_data *data));
 
 krb5_error_code get_securid_padata
-    PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
+    KRB5_PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
               krb5_pa_data *data));
 
 krb5_error_code verify_securid_padata
-    PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
+    KRB5_PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
               krb5_data *data));
 
 #endif /* KRB5_PREAUTH__ */