From 81a6ce40fb11585a7bc50740132d42ff4735b72d Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Wed, 27 Sep 1995 00:10:13 +0000 Subject: [PATCH] k5-int.h: Don't predefine symbols to stop kdb.h and kdb_dbm.h for _MSDOS. krb5.hin, k5-int.h: Move some src/lib/krb5/os prototypes to krb5.hin. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6865 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/ChangeLog | 8 ++++++ src/include/k5-int.h | 59 ++---------------------------------------- src/include/krb5.hin | 60 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 57 deletions(-) diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 20a7868cf..ca31faff0 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,11 @@ +Tue Sep 26 15:18:26 1995 + + * k5-int.h: Don't predefine symbols to stop kdb.h and kdb_dbm.h + for _MSDOS. + + * krb5.hin, k5-int.h: Move some src/lib/krb5/os prototypes to + krb5.hin. + Mon Sep 25 16:39:21 1995 Theodore Y. Ts'o * Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the diff --git a/src/include/k5-int.h b/src/include/k5-int.h index bc0be1942..cb70dec60 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -63,10 +63,6 @@ #define INI_KRB_CCACHE "krb5cc" /* Location of the ccache */ #define INI_KRB5_CONF "krb5.ini" /* Location of krb5.conf file */ -#define KRB5_DBM_COMPAT__ /* Don't load dbm.h */ -#define KRB5_KDB5__ /* Don't load kdb.h */ -#define KRB5_KDB5_DBM__ /* Don't load kdb_dbm.h */ - #define BITS16 #define SIZEOF_INT 2 #define SIZEOF_SHORT 2 @@ -482,8 +478,7 @@ typedef krb5_etype_info_entry ** krb5_etype_info; /* * Begin "dbm.h" */ -#if !defined(KRB5_DBM_COMPAT__) && !defined(_MACINTOSH) -#define KRB5_DBM_COMPAT__ +#if !defined(_MACINTOSH) && !defined(_MSDOS) #include "osconf.h" @@ -518,7 +513,7 @@ typedef char DBM; #define dbm_close(db) dbmclose() #endif /* OLD DBM */ -#endif /* KRB5_DBM_COMPAT__ */ +#endif /* !MSDOS && !MACINTOSH */ /* * End "dbm.h" */ @@ -620,12 +615,6 @@ extern char *strdup KRB5_PROTOTYPE((const char *)); #include /* libos.spec */ -krb5_error_code krb5_read_password - KRB5_PROTOTYPE((krb5_context, - const char *, - const char *, - char *, - int * )); krb5_error_code krb5_lock_file KRB5_PROTOTYPE((krb5_context, int, @@ -655,25 +644,6 @@ krb5_error_code krb5_get_krbhst krb5_error_code krb5_free_krbhst KRB5_PROTOTYPE((krb5_context, char * const * )); -krb5_error_code krb5_aname_to_localname - KRB5_PROTOTYPE((krb5_context, - krb5_const_principal, - const int, - char * )); -krb5_error_code krb5_get_host_realm - KRB5_PROTOTYPE((krb5_context, - const char *, - char *** )); -krb5_error_code krb5_free_host_realm - KRB5_PROTOTYPE((krb5_context, - char * const * )); -krb5_error_code krb5_get_realm_domain - KRB5_PROTOTYPE((krb5_context, - const char *, - char ** )); -krb5_boolean krb5_kuserok - KRB5_PROTOTYPE((krb5_context, - krb5_principal, const char *)); krb5_error_code krb5_random_confounder KRB5_PROTOTYPE((int, krb5_pointer )); @@ -682,15 +652,6 @@ krb5_error_code krb5_gen_replay_name const krb5_address *, const char *, char **)); -krb5_error_code INTERFACE krb5_auth_con_genaddrs - KRB5_PROTOTYPE((krb5_context, - krb5_auth_context, - int, int)); -krb5_error_code krb5_gen_portaddr - KRB5_PROTOTYPE((krb5_context, - const krb5_address *, - krb5_const_pointer, - krb5_address **)); krb5_error_code krb5_create_secure_file KRB5_PROTOTYPE((krb5_context, const char * pathname)); @@ -717,22 +678,6 @@ void krb5_os_free_context krb5_error_code krb5_find_config_files KRB5_PROTOTYPE(()); -krb5_error_code krb5_make_fulladdr - KRB5_PROTOTYPE((krb5_context, - krb5_address *, - krb5_address *, - krb5_address *)); - -krb5_error_code krb5_set_real_time - KRB5_PROTOTYPE((krb5_context, krb5_int32, krb5_int32)); -krb5_error_code krb5_set_debugging_time - KRB5_PROTOTYPE((krb5_context, krb5_int32, krb5_int32)); -krb5_error_code krb5_use_natural_time - KRB5_PROTOTYPE((krb5_context)); -krb5_error_code krb5_get_time_offsets - KRB5_PROTOTYPE((krb5_context, krb5_int32 *, krb5_int32 *)); -krb5_error_code krb5_set_time_offsets - KRB5_PROTOTYPE((krb5_context, krb5_int32, krb5_int32)); /* in here to deal with stuff from lib/crypto/os */ diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 9ac86d4c3..4999d4475 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -1893,6 +1893,66 @@ krb5_error_code krb5_auth_con_getremotesubkey * end "func-proto.h" */ +/* + * begin stuff from libos.h + */ + +krb5_error_code krb5_read_password + KRB5_PROTOTYPE((krb5_context, + const char *, + const char *, + char *, + int * )); +krb5_error_code krb5_aname_to_localname + KRB5_PROTOTYPE((krb5_context, + krb5_const_principal, + const int, + char * )); +krb5_error_code krb5_get_host_realm + KRB5_PROTOTYPE((krb5_context, + const char *, + char *** )); +krb5_error_code krb5_free_host_realm + KRB5_PROTOTYPE((krb5_context, + char * const * )); +krb5_error_code krb5_get_realm_domain + KRB5_PROTOTYPE((krb5_context, + const char *, + char ** )); +krb5_boolean krb5_kuserok + KRB5_PROTOTYPE((krb5_context, + krb5_principal, const char *)); +krb5_error_code INTERFACE krb5_auth_con_genaddrs + KRB5_PROTOTYPE((krb5_context, + krb5_auth_context, + int, int)); +krb5_error_code krb5_gen_portaddr + KRB5_PROTOTYPE((krb5_context, + const krb5_address *, + krb5_const_pointer, + krb5_address **)); +krb5_error_code krb5_make_fulladdr + KRB5_PROTOTYPE((krb5_context, + krb5_address *, + krb5_address *, + krb5_address *)); + +krb5_error_code krb5_set_real_time + KRB5_PROTOTYPE((krb5_context, krb5_int32, krb5_int32)); +krb5_error_code krb5_set_debugging_time + KRB5_PROTOTYPE((krb5_context, krb5_int32, krb5_int32)); +krb5_error_code krb5_use_natural_time + KRB5_PROTOTYPE((krb5_context)); +krb5_error_code krb5_get_time_offsets + KRB5_PROTOTYPE((krb5_context, krb5_int32 *, krb5_int32 *)); +krb5_error_code krb5_set_time_offsets + KRB5_PROTOTYPE((krb5_context, krb5_int32, krb5_int32)); + + +/* + * end stuff from libos.h + */ + /* * begin "k5-free.h" */ -- 2.26.2