Make prototypes unconditional

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

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index eaaaf71a9d2f0037256d78aeb9c7af8e65f3647f..851a8c07e46eef2f8f277bb83e3eccababf76d72 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-16  Ken Raeburn  <raeburn@mit.edu>
+
+       * adm_proto.h, kdb.h, kdb_dbc.h, kdb_dbm.h, kdb_kt.h: Make all
+       prototypes unconditional.
+
 2000-05-30  Wilfredo Sanchez  <tritan@mit.edu>
 
        * Makefile.in, osconf.h: Use bindir and sbindir from configure

diff --git a/src/include/krb5/adm_proto.h b/src/include/krb5/adm_proto.h
index bcfe0aee960fcadc14eeb42cecf2801f479aaf45..358889ed7641394339c918866a73222a1794d790 100644 (file)
--- a/src/include/krb5/adm_proto.h
+++ b/src/include/krb5/adm_proto.h
@@ -55,162 +55,160 @@ typedef struct ___krb5_key_salt_tuple krb5_key_salt_tuple;
 
 /* adm_conn.c */
 KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_adm_connect
-       KRB5_PROTOTYPE((krb5_context,
-                  char *,
-                  char *,
-                  char *,
-                  int *,
-                  krb5_auth_context *,
-                  krb5_ccache *,
-                  char *,
-                  krb5_timestamp));
+       (krb5_context,
+        char *,
+        char *,
+        char *,
+        int *,
+        krb5_auth_context *,
+        krb5_ccache *,
+        char *,
+        krb5_timestamp);
 KRB5_DLLIMP void KRB5_CALLCONV krb5_adm_disconnect
-       KRB5_PROTOTYPE((krb5_context,
-                  int *,
-                  krb5_auth_context,
-                  krb5_ccache));
+       (krb5_context,
+        int *,
+        krb5_auth_context,
+        krb5_ccache);
 
 #if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)
 /* adm_kw_dec.c */
 krb5_error_code krb5_adm_proto_to_dbent
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_int32,
-                  krb5_data *,
-                  krb5_ui_4 *,
-                  krb5_db_entry *,
-                  char **));
+       (krb5_context,
+        krb5_int32,
+        krb5_data *,
+        krb5_ui_4 *,
+        krb5_db_entry *,
+        char **);
 
 /* adm_kw_enc.c */
 krb5_error_code krb5_adm_dbent_to_proto
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_ui_4,
-                  krb5_db_entry *,
-                  char *,
-                  krb5_int32 *,
-                  krb5_data **));
+       (krb5_context,
+        krb5_ui_4,
+        krb5_db_entry *,
+        char *,
+        krb5_int32 *,
+        krb5_data **);
 #endif /* !(windows or macintosh) */
 
 /* adm_kt_dec.c */
 krb5_error_code krb5_adm_proto_to_ktent
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_int32,
-                  krb5_data *,
-                  krb5_keytab_entry *));
+       (krb5_context,
+        krb5_int32,
+        krb5_data *,
+        krb5_keytab_entry *);
 
 /* adm_kt_enc.c */
 krb5_error_code krb5_adm_ktent_to_proto
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_keytab_entry *,
-                  krb5_int32 *,
-                  krb5_data **));
+       (krb5_context,
+        krb5_keytab_entry *,
+        krb5_int32 *,
+        krb5_data **);
 
 /* adm_rw.c */
 KRB5_DLLIMP void KRB5_CALLCONV krb5_free_adm_data
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_int32,
-                  krb5_data *));
+       (krb5_context,
+        krb5_int32,
+        krb5_data *);
 
 KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_send_adm_cmd
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_pointer,
-                  krb5_auth_context,
-                  krb5_int32,
-                  krb5_data *));
+       (krb5_context,
+        krb5_pointer,
+        krb5_auth_context,
+        krb5_int32,
+        krb5_data *);
 krb5_error_code krb5_send_adm_reply
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_pointer,
-                  krb5_auth_context,
-                  krb5_int32,
-                  krb5_int32,
-                  krb5_data *));
+       (krb5_context,
+        krb5_pointer,
+        krb5_auth_context,
+        krb5_int32,
+        krb5_int32,
+        krb5_data *);
 krb5_error_code krb5_read_adm_cmd
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_pointer,
-                  krb5_auth_context,
-                  krb5_int32 *,
-                  krb5_data **));
+       (krb5_context,
+        krb5_pointer,
+        krb5_auth_context,
+        krb5_int32 *,
+        krb5_data **);
 KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_read_adm_reply
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_pointer,
-                  krb5_auth_context,
-                  krb5_int32 *,
-                  krb5_int32 *,
-                  krb5_data **));
+       (krb5_context,
+        krb5_pointer,
+        krb5_auth_context,
+        krb5_int32 *,
+        krb5_int32 *,
+        krb5_data **);
 
 /* logger.c */
 krb5_error_code krb5_klog_init
-       KRB5_PROTOTYPE((krb5_context,
-                  char *,
-                  char *,
-                  krb5_boolean));
-void krb5_klog_close KRB5_PROTOTYPE((krb5_context));
-int krb5_klog_syslog KRB5_PROTOTYPE((int, const char *, ...));
-void krb5_klog_reopen KRB5_PROTOTYPE((krb5_context));
+       (krb5_context,
+        char *,
+        char *,
+        krb5_boolean);
+void krb5_klog_close (krb5_context);
+int krb5_klog_syslog (int, const char *, ...);
+void krb5_klog_reopen (krb5_context);
 
 /* alt_prof.c */
 krb5_error_code krb5_aprof_init
-       KRB5_PROTOTYPE((char *, char *, krb5_pointer *));
+       (char *, char *, krb5_pointer *);
 krb5_error_code krb5_aprof_getvals
-       KRB5_PROTOTYPE((krb5_pointer, const char **, char ***));
+       (krb5_pointer, const char **, char ***);
 krb5_error_code krb5_aprof_get_deltat
-       KRB5_PROTOTYPE((krb5_pointer,
-                       const char **,
-                       krb5_boolean,
-                       krb5_deltat *));
+       (krb5_pointer,
+        const char **,
+        krb5_boolean,
+        krb5_deltat *);
 krb5_error_code krb5_aprof_get_string
-       KRB5_PROTOTYPE((krb5_pointer, const char **, krb5_boolean, char **));
+       (krb5_pointer, const char **, krb5_boolean, char **);
 krb5_error_code krb5_aprof_get_int32
-       KRB5_PROTOTYPE((krb5_pointer,
-                       const char **,
-                       krb5_boolean,
-                       krb5_int32 *));
-krb5_error_code krb5_aprof_finish KRB5_PROTOTYPE((krb5_pointer));
-
-krb5_error_code krb5_read_realm_params KRB5_PROTOTYPE((krb5_context,
-                                                      char *,
-                                                      char *,
-                                                      char *,
-                                                      krb5_realm_params **));
-krb5_error_code krb5_free_realm_params KRB5_PROTOTYPE((krb5_context,
-                                                      krb5_realm_params *));
+       (krb5_pointer,
+        const char **,
+        krb5_boolean,
+        krb5_int32 *);
+krb5_error_code krb5_aprof_finish (krb5_pointer);
+
+krb5_error_code krb5_read_realm_params (krb5_context,
+                                       char *,
+                                       char *,
+                                       char *,
+                                       krb5_realm_params **);
+krb5_error_code krb5_free_realm_params (krb5_context,
+                                       krb5_realm_params *);
 
 /* str_conv.c */
 krb5_error_code
-krb5_string_to_flags KRB5_PROTOTYPE((char *,
-                                    const char *,
-                                    const char *,
-                                    krb5_flags *));
+krb5_string_to_flags (char *,
+                     const char *,
+                     const char *,
+                     krb5_flags *);
 krb5_error_code
-krb5_flags_to_string KRB5_PROTOTYPE((krb5_flags,
-                                    const char *,
-                                    char *,
-                                    size_t));
+krb5_flags_to_string (krb5_flags,
+                     const char *,
+                     char *,
+                     size_t);
 krb5_error_code
-krb5_input_flag_to_string KRB5_PROTOTYPE((int, 
-                                       char *,
-                                       size_t));
+krb5_input_flag_to_string (int, 
+                          char *,
+                          size_t);
 
 /* keysalt.c */
 krb5_boolean
-krb5_keysalt_is_present KRB5_PROTOTYPE((krb5_key_salt_tuple *,
-                                       krb5_int32,
-                                       krb5_enctype,
-                                       krb5_int32));
+krb5_keysalt_is_present (krb5_key_salt_tuple *,
+                        krb5_int32,
+                        krb5_enctype,
+                        krb5_int32);
 krb5_error_code
-krb5_keysalt_iterate
-       KRB5_PROTOTYPE((krb5_key_salt_tuple *,
-                       krb5_int32,
-                       krb5_boolean,
-                       krb5_error_code (*)
-                               KRB5_NPROTOTYPE((krb5_key_salt_tuple *,
-                                                krb5_pointer)),
-                       krb5_pointer));
+krb5_keysalt_iterate (krb5_key_salt_tuple *,
+                     krb5_int32,
+                     krb5_boolean,
+                     krb5_error_code (*) (krb5_key_salt_tuple *,
+                                          krb5_pointer),
+                     krb5_pointer);
                                     
 krb5_error_code
-krb5_string_to_keysalts KRB5_PROTOTYPE((char *,
-                                       const char *,
-                                       const char *,
-                                       krb5_boolean,
-                                       krb5_key_salt_tuple **,
-                                       krb5_int32 *));
+krb5_string_to_keysalts (char *,
+                        const char *,
+                        const char *,
+                        krb5_boolean,
+                        krb5_key_salt_tuple **,
+                        krb5_int32 *);
 #endif /* KRB5_ADM_PROTO_H__ */

diff --git a/src/include/krb5/kdb.h b/src/include/krb5/kdb.h
index 8316efefc47cdf215a920627ae084a6346efa47d..fc20b876629875575a07c8034f95b50f6f59fa0d 100644 (file)
--- a/src/include/krb5/kdb.h
+++ b/src/include/krb5/kdb.h
@@ -195,214 +195,134 @@ extern char *krb5_mkey_pwd_prompt2;
        }
 
 /* libkdb.spec */
-krb5_error_code krb5_db_set_name
-       KRB5_PROTOTYPE((krb5_context,
-                  char * ));
-krb5_error_code krb5_db_init
-       KRB5_PROTOTYPE((krb5_context));
-krb5_error_code krb5_db_fini
-       KRB5_PROTOTYPE((krb5_context));
-krb5_error_code krb5_db_get_age
-       KRB5_PROTOTYPE((krb5_context,
-                  char *,
-                  time_t * ));
-krb5_error_code krb5_db_create
-       KRB5_PROTOTYPE((krb5_context,
-                  char *,
-                  krb5_int32 ));
-krb5_error_code krb5_db_rename
-       KRB5_PROTOTYPE((krb5_context,
-                  char *,
-                  char * ));
-krb5_error_code krb5_db_get_principal
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_const_principal ,
-                  krb5_db_entry *,
-                  int *,
-                  krb5_boolean * ));
-void krb5_db_free_principal
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_db_entry *,
-                  int  ));
-krb5_error_code krb5_db_put_principal
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_db_entry *,
-                  int * ));
-krb5_error_code krb5_db_delete_principal
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_const_principal,
-                  int * ));
-krb5_error_code krb5_db_iterate
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_error_code (* ) KRB5_PROTOTYPE((krb5_pointer,
-                                                  krb5_db_entry *)),
-                  krb5_pointer ));
-krb5_error_code krb5_db_verify_master_key
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_principal, 
-                  krb5_keyblock *));
-krb5_error_code krb5_db_store_mkey 
-       KRB5_PROTOTYPE((krb5_context,
-                  char *,
-                  krb5_principal,
-                  krb5_keyblock *));
-
-krb5_error_code krb5_db_setup_mkey_name
-       KRB5_PROTOTYPE((krb5_context,
-                  const char *, 
-                  const char *, 
-                  char **, 
-                  krb5_principal *));
-
-krb5_error_code krb5_db_set_mkey
-        KRB5_PROTOTYPE((krb5_context, krb5_keyblock *));
-
-krb5_error_code krb5_db_get_mkey
-        KRB5_PROTOTYPE((krb5_context, krb5_keyblock **));
-krb5_error_code krb5_db_destroy 
-       KRB5_PROTOTYPE((krb5_context,
-                  char * ));
-krb5_error_code krb5_db_lock
-       KRB5_PROTOTYPE((krb5_context,
-                  int ));
-krb5_error_code krb5_db_unlock
-       KRB5_PROTOTYPE((krb5_context));
-krb5_error_code krb5_db_set_nonblocking
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_boolean,
-                  krb5_boolean * ));
-krb5_boolean krb5_db_set_lockmode
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_boolean));
-krb5_error_code        krb5_db_fetch_mkey
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_principal, 
-                  krb5_enctype, 
-                  krb5_boolean,
-                  krb5_boolean, 
-                  char *,
-                  krb5_data *, 
-                  krb5_keyblock * ));
-
-krb5_error_code krb5_db_open_database
-       KRB5_PROTOTYPE((krb5_context));
-krb5_error_code krb5_db_close_database
-       KRB5_PROTOTYPE((krb5_context));
-
-krb5_error_code krb5_dbekd_encrypt_key_data
-       KRB5_PROTOTYPE((krb5_context,
-                  const krb5_keyblock *,
-                  const krb5_keyblock *,
-                  const krb5_keysalt *,
-                  int,
-                  krb5_key_data *));
-krb5_error_code krb5_dbekd_decrypt_key_data
-       KRB5_PROTOTYPE((krb5_context,
-                  const krb5_keyblock *,
-                  const krb5_key_data *,
-                  krb5_keyblock *,
-                  krb5_keysalt *));
-krb5_error_code krb5_dbe_create_key_data
-       KRB5_PROTOTYPE((krb5_context,
-                       krb5_db_entry *));
-krb5_error_code krb5_dbe_update_tl_data
-       KRB5_PROTOTYPE((krb5_context,
-                       krb5_db_entry *,
-                       krb5_tl_data *));
-krb5_error_code krb5_dbe_lookup_tl_data
-       KRB5_PROTOTYPE((krb5_context,
-                       krb5_db_entry *,
-                       krb5_tl_data *));
-krb5_error_code krb5_dbe_update_last_pwd_change
-       KRB5_PROTOTYPE((krb5_context,
-                       krb5_db_entry *,
-                       krb5_timestamp));
-krb5_error_code krb5_dbe_lookup_last_pwd_change
-       KRB5_PROTOTYPE((krb5_context,
-                       krb5_db_entry *,
-                       krb5_timestamp *));
-krb5_error_code krb5_dbe_update_mod_princ_data
-       KRB5_PROTOTYPE((krb5_context,
-                       krb5_db_entry *,
-                       krb5_timestamp,
-                       krb5_const_principal));
-krb5_error_code krb5_dbe_lookup_mod_princ_data
-       KRB5_PROTOTYPE((krb5_context,
-                       krb5_db_entry *,
-                       krb5_timestamp *,
-                       krb5_principal *));
-int krb5_encode_princ_dbkey
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_data  *,
-                  krb5_const_principal));
-void krb5_free_princ_dbkey
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_data *));
-krb5_error_code krb5_encode_princ_contents
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_data  *,
-                  krb5_db_entry *));
-void krb5_free_princ_contents
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_data  *));
-krb5_error_code krb5_decode_princ_contents
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_data  *,
-                  krb5_db_entry *));
-void krb5_dbe_free_contents
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_db_entry *));
-
-krb5_error_code krb5_dbe_find_enctype
-       KRB5_PROTOTYPE((krb5_context,
-                       krb5_db_entry *,
-                       krb5_int32,
-                       krb5_int32,
-                       krb5_int32,
-                       krb5_key_data **));
-
-krb5_error_code krb5_dbe_search_enctype
-       KRB5_PROTOTYPE((krb5_context,
-                       krb5_db_entry *,
-                       krb5_int32 *,
-                       krb5_int32,
-                       krb5_int32,
-                       krb5_int32,
-                       krb5_key_data **));
+krb5_error_code krb5_db_set_name (krb5_context, char * );
+krb5_error_code krb5_db_init (krb5_context);
+krb5_error_code krb5_db_fini (krb5_context);
+krb5_error_code krb5_db_get_age (krb5_context, char *, time_t * );
+krb5_error_code krb5_db_create (krb5_context, char *, krb5_int32 );
+krb5_error_code krb5_db_rename (krb5_context, char *, char * );
+krb5_error_code krb5_db_get_principal (krb5_context, krb5_const_principal ,
+                                      krb5_db_entry *, int *,
+                                      krb5_boolean * );
+void krb5_db_free_principal (krb5_context, krb5_db_entry *, int  );
+krb5_error_code krb5_db_put_principal (krb5_context, krb5_db_entry *, int * );
+krb5_error_code krb5_db_delete_principal (krb5_context, krb5_const_principal,
+                                         int * );
+krb5_error_code krb5_db_iterate (krb5_context,
+                                krb5_error_code (* ) (krb5_pointer,
+                                                      krb5_db_entry *),
+                                krb5_pointer);
+krb5_error_code krb5_db_verify_master_key (krb5_context, krb5_principal, 
+                                          krb5_keyblock *);
+krb5_error_code krb5_db_store_mkey (krb5_context, char *, krb5_principal,
+                                   krb5_keyblock *);
+
+krb5_error_code krb5_db_setup_mkey_name (krb5_context, const char *, 
+                                        const char *, char **,
+                                        krb5_principal *);
+
+krb5_error_code krb5_db_set_mkey (krb5_context, krb5_keyblock *);
+
+krb5_error_code krb5_db_get_mkey (krb5_context, krb5_keyblock **);
+krb5_error_code krb5_db_destroy (krb5_context, char * );
+krb5_error_code krb5_db_lock (krb5_context, int );
+krb5_error_code krb5_db_unlock (krb5_context);
+krb5_error_code krb5_db_set_nonblocking (krb5_context, krb5_boolean,
+                                        krb5_boolean * );
+krb5_boolean krb5_db_set_lockmode (krb5_context, krb5_boolean);
+krb5_error_code        krb5_db_fetch_mkey (krb5_context, krb5_principal, krb5_enctype,
+                                   krb5_boolean, krb5_boolean, char *,
+                                   krb5_data *, 
+                                   krb5_keyblock * );
+
+krb5_error_code krb5_db_open_database (krb5_context);
+krb5_error_code krb5_db_close_database (krb5_context);
+
+krb5_error_code krb5_dbekd_encrypt_key_data (krb5_context,
+                                            const krb5_keyblock *,
+                                            const krb5_keyblock *,
+                                            const krb5_keysalt *,
+                                            int,
+                                            krb5_key_data *);
+krb5_error_code krb5_dbekd_decrypt_key_data (krb5_context,
+                                            const krb5_keyblock *,
+                                            const krb5_key_data *,
+                                            krb5_keyblock *,
+                                            krb5_keysalt *);
+krb5_error_code krb5_dbe_create_key_data (krb5_context,
+                                         krb5_db_entry *);
+krb5_error_code krb5_dbe_update_tl_data (krb5_context,
+                                        krb5_db_entry *,
+                                        krb5_tl_data *);
+krb5_error_code krb5_dbe_lookup_tl_data (krb5_context,
+                                        krb5_db_entry *,
+                                        krb5_tl_data *);
+krb5_error_code krb5_dbe_update_last_pwd_change (krb5_context,
+                                                krb5_db_entry *,
+                                                krb5_timestamp);
+krb5_error_code krb5_dbe_lookup_last_pwd_change (krb5_context,
+                                                krb5_db_entry *,
+                                                krb5_timestamp *);
+krb5_error_code krb5_dbe_update_mod_princ_data (krb5_context,
+                                               krb5_db_entry *,
+                                               krb5_timestamp,
+                                               krb5_const_principal);
+krb5_error_code krb5_dbe_lookup_mod_princ_data (krb5_context,
+                                               krb5_db_entry *,
+                                               krb5_timestamp *,
+                                               krb5_principal *);
+int krb5_encode_princ_dbkey (krb5_context, krb5_data  *, krb5_const_principal);
+void krb5_free_princ_dbkey (krb5_context, krb5_data *);
+krb5_error_code krb5_encode_princ_contents (krb5_context, krb5_data *,
+                                           krb5_db_entry *);
+void krb5_free_princ_contents (krb5_context, krb5_data  *);
+krb5_error_code krb5_decode_princ_contents (krb5_context, krb5_data  *,
+                                           krb5_db_entry *);
+void krb5_dbe_free_contents (krb5_context, krb5_db_entry *);
+
+krb5_error_code krb5_dbe_find_enctype (krb5_context, krb5_db_entry *,
+                                      krb5_int32,
+                                      krb5_int32,
+                                      krb5_int32,
+                                      krb5_key_data **);
+
+krb5_error_code krb5_dbe_search_enctype (krb5_context,
+                                        krb5_db_entry *,
+                                        krb5_int32 *,
+                                        krb5_int32,
+                                        krb5_int32,
+                                        krb5_int32,
+                                        krb5_key_data **);
 
 struct __krb5_key_salt_tuple;
 
-krb5_error_code krb5_dbe_cpw
-        KRB5_PROTOTYPE((krb5_context,
-                       krb5_keyblock  *,
-                       struct __krb5_key_salt_tuple *,
-                       int,
-                       char *,
-                       int,
-                       krb5_boolean,
-                       krb5_db_entry *));
-krb5_error_code krb5_dbe_apw
-        KRB5_PROTOTYPE((krb5_context,
-                   krb5_keyblock  *,
-                   struct __krb5_key_salt_tuple *,
-                   int,
-                   char *,
-                   krb5_db_entry *));
-krb5_error_code krb5_dbe_crk
-        KRB5_PROTOTYPE((krb5_context,
-                   krb5_keyblock  *,
-                   struct __krb5_key_salt_tuple *,
-                   int,
-                  krb5_boolean,
-                   krb5_db_entry *));
-krb5_error_code krb5_dbe_ark
-        KRB5_PROTOTYPE((krb5_context,
-                   krb5_keyblock  *,
-                   struct __krb5_key_salt_tuple *,
-                   int,
-                   krb5_db_entry *));
-
-krb5_error_code krb5_ser_db_context_init KRB5_PROTOTYPE((krb5_context));
+krb5_error_code krb5_dbe_cpw (krb5_context,
+                             krb5_keyblock  *,
+                             struct __krb5_key_salt_tuple *,
+                             int,
+                             char *,
+                             int,
+                             krb5_boolean,
+                             krb5_db_entry *);
+krb5_error_code krb5_dbe_apw (krb5_context,
+                             krb5_keyblock  *,
+                             struct __krb5_key_salt_tuple *,
+                             int,
+                             char *,
+                             krb5_db_entry *);
+krb5_error_code krb5_dbe_crk (krb5_context,
+                             krb5_keyblock  *,
+                             struct __krb5_key_salt_tuple *,
+                             int,
+                             krb5_boolean,
+                             krb5_db_entry *);
+krb5_error_code krb5_dbe_ark (krb5_context,
+                             krb5_keyblock  *,
+                             struct __krb5_key_salt_tuple *,
+                             int,
+                             krb5_db_entry *);
+
+krb5_error_code krb5_ser_db_context_init (krb5_context);
  
 #define KRB5_KDB_DEF_FLAGS     0
 
@@ -464,19 +384,18 @@ typedef struct _kdb5_dispatch_table {
     char *     kdb5_db_index_ext;
     char *     kdb5_db_data_ext;
     char *     kdb5_db_lock_ext;
-    DBM *      (*kdb5_dbm_open) KRB5_NPROTOTYPE((const char *, int, int));
-    void       (*kdb5_dbm_close) KRB5_NPROTOTYPE((DBM *));
-    datum      (*kdb5_dbm_fetch) KRB5_NPROTOTYPE((DBM *, datum));
-    datum      (*kdb5_dbm_firstkey) KRB5_NPROTOTYPE((DBM *));
-    datum      (*kdb5_dbm_nextkey) KRB5_NPROTOTYPE((DBM *));
-    int                (*kdb5_dbm_delete) KRB5_NPROTOTYPE((DBM *, datum));
-    int                (*kdb5_dbm_store) KRB5_NPROTOTYPE((DBM *, datum, datum, int));
-    int                (*kdb5_dbm_dirfno) KRB5_NPROTOTYPE((DBM *));
-    int                (*kdb5_dbm_pagfno) KRB5_NPROTOTYPE((DBM *));
+    DBM *      (*kdb5_dbm_open) (const char *, int, int);
+    void       (*kdb5_dbm_close) (DBM *);
+    datum      (*kdb5_dbm_fetch) (DBM *, datum);
+    datum      (*kdb5_dbm_firstkey) (DBM *);
+    datum      (*kdb5_dbm_nextkey) (DBM *);
+    int                (*kdb5_dbm_delete) (DBM *, datum);
+    int                (*kdb5_dbm_store) (DBM *, datum, datum, int);
+    int                (*kdb5_dbm_dirfno) (DBM *);
+    int                (*kdb5_dbm_pagfno) (DBM *);
 } kdb5_dispatch_table;
 
-krb5_error_code kdb5_db_set_dbops KRB5_PROTOTYPE((krb5_context,
-                                                 kdb5_dispatch_table *));
+krb5_error_code kdb5_db_set_dbops (krb5_context, kdb5_dispatch_table *);
 #else
 typedef        struct _kdb5_dispatch_table kdb5_dispatch_table;
 #endif /* KDB5_DISPATCH */

diff --git a/src/include/krb5/kdb_dbc.h b/src/include/krb5/kdb_dbc.h
index 4165ca2a78bfeb98f8c3816a769220f784d8f633..134d63014df5e3b14b0927c199551a13a5cc102f 100644 (file)
--- a/src/include/krb5/kdb_dbc.h
+++ b/src/include/krb5/kdb_dbc.h
@@ -77,13 +77,13 @@ typedef struct __krb5_db_context {
 } krb5_db_context;
 
 krb5_error_code krb5_ktkdb_resolve
-        KRB5_PROTOTYPE((krb5_context, krb5_db_context *, krb5_keytab *));
+        (krb5_context, krb5_db_context *, krb5_keytab *);
 
 krb5_error_code krb5_dbm_db_set_mkey
-        KRB5_PROTOTYPE((krb5_context,krb5_db_context *,krb5_encrypt_block *));
+        (krb5_context,krb5_db_context *,krb5_encrypt_block *);
 
 krb5_error_code krb5_dbm_db_get_mkey
-        KRB5_PROTOTYPE((krb5_context,krb5_db_context *,krb5_encrypt_block **));
+        (krb5_context,krb5_db_context *,krb5_encrypt_block **);
 
 #endif /* !defined(macintosh) && !defined(_MSDOS) */
 #endif /* KRB5_KDB5_DBM__ */

diff --git a/src/include/krb5/kdb_dbm.h b/src/include/krb5/kdb_dbm.h
index 57eb5362332d5408d09b9355bbdd1568c02a5293..17fe29f0e4d221b7ebffd3b9384dab194ca1a7d3 100644 (file)
--- a/src/include/krb5/kdb_dbm.h
+++ b/src/include/krb5/kdb_dbm.h
@@ -63,60 +63,58 @@
 
 /* libkdb.spec */
 krb5_error_code krb5_dbm_db_set_name 
-       KRB5_PROTOTYPE((krb5_context,
-                  char * ));
+       (krb5_context, char * );
 krb5_error_code krb5_dbm_db_init 
-       KRB5_PROTOTYPE((krb5_context));
+       (krb5_context);
 krb5_error_code krb5_dbm_db_fini 
-       KRB5_PROTOTYPE((krb5_context));
+       (krb5_context);
 krb5_error_code krb5_dbm_db_get_age 
-       KRB5_PROTOTYPE((krb5_context,
-                  char *,
-                  time_t * ));
+       (krb5_context,
+        char *,
+        time_t * );
 krb5_error_code krb5_dbm_db_create 
-       KRB5_PROTOTYPE((krb5_context,
-                  char * ));
+       (krb5_context,
+        char * );
 krb5_error_code krb5_dbm_db_destroy 
-       KRB5_PROTOTYPE((krb5_context,
-                  char * ));
+       (krb5_context,
+        char * );
 krb5_error_code krb5_dbm_db_rename 
-       KRB5_PROTOTYPE((krb5_context,
-                  char *,
-                  char * ));
+       (krb5_context,
+        char *,
+        char * );
 krb5_error_code krb5_dbm_db_get_principal 
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_const_principal,
-                  krb5_db_entry *,
-                  int *,
-                  krb5_boolean * ));
+       (krb5_context,
+        krb5_const_principal,
+        krb5_db_entry *,
+        int *,
+        krb5_boolean * );
 void krb5_dbm_db_free_principal 
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_db_entry *,
-                  int ));
+       (krb5_context,
+        krb5_db_entry *,
+        int );
 krb5_error_code krb5_dbm_db_delete_principal 
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_const_principal,
-                  int * ));
+       (krb5_context,
+        krb5_const_principal,
+        int * );
 krb5_error_code krb5_dbm_db_put_principal 
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_db_entry *,
-                  int * ));
+       (krb5_context,
+        krb5_db_entry *,
+        int * );
 krb5_error_code krb5_dbm_db_iterate
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_error_code (*) KRB5_PROTOTYPE((krb5_pointer,
-                                                 krb5_db_entry *)),
-                  krb5_pointer ));
+        (krb5_context,
+        krb5_error_code (*) (krb5_pointer, krb5_db_entry *),
+        krb5_pointer );
 krb5_error_code krb5_dbm_db_set_nonblocking 
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_boolean,
-                  krb5_boolean * ));
+       (krb5_context,
+        krb5_boolean,
+        krb5_boolean * );
 krb5_boolean krb5_dbm_db_set_lockmode
-       KRB5_PROTOTYPE((krb5_context,
-                  krb5_boolean ));
+       (krb5_context,
+        krb5_boolean );
 krb5_error_code krb5_dbm_db_open_database 
-       KRB5_PROTOTYPE((krb5_context));
+       (krb5_context);
 krb5_error_code krb5_dbm_db_close_database 
-       KRB5_PROTOTYPE((krb5_context));
+       (krb5_context);
 
 #endif /* !defined(macintosh) && !defined(_MSDOS) && !defined(WIN32) */
 #endif /* KRB5_KDB5_DBM__ */

diff --git a/src/include/krb5/kdb_kt.h b/src/include/krb5/kdb_kt.h
index 3b795e482dcd9dc408d82bf4423e0f954b3a74a2..cd0bf9290a2d575b5554a1ebe6a681113691bcc1 100644 (file)
--- a/src/include/krb5/kdb_kt.h
+++ b/src/include/krb5/kdb_kt.h
@@ -35,8 +35,7 @@
 
 #include "kdb.h"
 
-krb5_error_code krb5_ktkdb_resolve
-        KRB5_PROTOTYPE((krb5_context, krb5_keytab *));
+krb5_error_code krb5_ktkdb_resolve (krb5_context, krb5_keytab *);
 
 #endif /* !defined(macintosh) && !defined(_MSDOS) */
 #endif /* KRB5_KDB5_DBM__ */