From 1364052f7b2120fcee8c59ae576abe2a81858b89 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Tue, 9 Feb 1999 03:09:22 +0000 Subject: [PATCH] Makefile.in: Link in the ccapi import library under windows krb5_16.def, krb5_32.def: Added a number of miscellaneous functions to the DLL exports list so that things build under Windows again. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11159 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/ChangeLog | 8 ++++++++ src/lib/Makefile.in | 7 +++++-- src/lib/krb5_16.def | 20 +++++++++++++++++++- src/lib/krb5_32.def | 6 ++++++ 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog index 7def7097e..e8b7241a7 100644 --- a/src/lib/ChangeLog +++ b/src/lib/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 8 22:08:22 1999 Theodore Y. Ts'o + + * Makefile.in: Link in the ccapi import library under windows. + + * krb5_16.def, krb5_32.def: Added a number of miscellaneous + functions to the DLL exports list so that things build + under Windows again. + 1999-01-27 Theodore Ts'o * Makefile.in, configure.in: Move the responsibility for diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index cd0e13c07..234512a33 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -35,6 +35,8 @@ KLIBS = krb5\krb5.lib crypto\crypto.lib \ GLIBS = gssapi\gssapi.lib K4LIBS = krb4\krb4.lib +##DOS##CCACHE_LIB = $(SRCTOP)\windows\lib\KrbCC32.lib + ##WIN16##VERLIBS=..\mit\windows\lib\vswin.lib c:\msvc\lib\ver.lib ##WIN32##VERLIBS=..\mit\windows\lib\vsnt.lib \ ##WIN32## "c:\program files\devstudio\vc\lib\version.lib" @@ -73,7 +75,7 @@ $(CLIB): $(CLIBS) $(WLIB) $(CDEF) no_glue.obj ##WIN32## link $(WINDLLFLAGS) /def:$(CDEF) /out:$*.dll \ ##WIN32## no_glue.obj version.res $(CLIBS) $(WINLIBS) -$(KLIB): $(KLIBS) $(CLIB) $(WLIB) $(KDEF) k5_glue.obj $(KRB5RC) +$(KLIB): $(KLIBS) $(CLIB) $(WLIB) $(KDEF) k5_glue.obj $(KRB5RC) $(CCACHE_LIB) ##WIN16## link /co /seg:400 /noe /nod /nol \ ##WIN16## k5_glue, $*.dll, $*.map, \ ##WIN16## $(MITLIBS) $(KLIBS) $(CLIB) $(WINLIBS), $(KDEF) @@ -83,7 +85,8 @@ $(KLIB): $(KLIBS) $(CLIB) $(WLIB) $(KDEF) k5_glue.obj $(KRB5RC) ##WIN32## rc $(CPPFLAGS) -DKRB5_LIB -D_WIN32 -D_MSDOS -DRES_ONLY \ ##WIN32## -fo version.res $(VERSIONRC) ##WIN32## link $(WINDLLFLAGS) /def:$(KDEF) /out:$*.dll \ -##WIN32## k5_glue.obj version.res $(KRB5RC) $(MITLIBS) $(KLIBS) $(CLIB) \ +##WIN32## k5_glue.obj version.res $(KRB5RC) $(MITLIBS) $(KLIBS) \ +##WIN32## $(CCACHE_LIB) $(CLIB) \ ##WIN32## $(WINLIBS) advapi32.lib gdi32.lib $(GLIB): $(GLIBS) $(KLIB) $(CLIB) $(GDEF) gss_glue.obj diff --git a/src/lib/krb5_16.def b/src/lib/krb5_16.def index f041ee472..70bc3442b 100644 --- a/src/lib/krb5_16.def +++ b/src/lib/krb5_16.def @@ -69,10 +69,25 @@ EXPORTS krb5_get_credentials_validate krb5_get_default_realm krb5_get_host_realm + krb5_get_realm_domain krb5_get_in_tkt krb5_get_in_tkt_with_keytab krb5_get_in_tkt_with_password krb5_get_in_tkt_with_skey + krb5_get_init_creds_opt_init + krb5_get_init_creds_opt_set_tkt_life + krb5_get_init_creds_opt_set_renew_life + krb5_get_init_creds_opt_set_forwardable + krb5_get_init_creds_opt_set_proxiable + krb5_get_init_creds_opt_set_etype_list + krb5_get_init_creds_opt_set_address_list + krb5_get_init_creds_opt_set_preauth_list + krb5_get_init_creds_opt_set_salt + krb5_get_init_creds_password + krb5_get_init_creds_keytab + krb5_get_init_creds_opt_init + krb5_get_validated_creds + krb5_get_renewed_creds krb5_get_notification_message krb5_init_context krb5_mk_error @@ -84,6 +99,7 @@ EXPORTS krb5_os_localaddr krb5_parse_name krb5_principal_compare + krb5_prompter_posix krb5_rd_cred krb5_rd_error krb5_rd_priv @@ -97,6 +113,7 @@ EXPORTS krb5_timeofday krb5_unparse_name krb5_unparse_name_ext + krb5_free_unparsed_name krb5_us_timeofday ; krb5_use_enctype @@ -171,7 +188,8 @@ EXPORTS des_pcbc_encrypt des_quad_cksum des_string_to_key - des_set_random_generator_seed +; des_set_random_generator_seed + des_init_random_number_generator profile_get_values krb5_random_confounder krb5_size_opaque diff --git a/src/lib/krb5_32.def b/src/lib/krb5_32.def index cc2a6d9b2..8b055be82 100644 --- a/src/lib/krb5_32.def +++ b/src/lib/krb5_32.def @@ -68,6 +68,7 @@ EXPORTS krb5_get_credentials_validate krb5_get_default_realm krb5_get_host_realm + krb5_get_realm_domain krb5_get_in_tkt krb5_get_in_tkt_with_keytab krb5_get_in_tkt_with_password @@ -84,6 +85,8 @@ EXPORTS krb5_get_init_creds_password krb5_get_init_creds_keytab krb5_get_init_creds_opt_init + krb5_get_validated_creds + krb5_get_renewed_creds krb5_get_notification_message krb5_init_context krb5_mk_error @@ -95,6 +98,7 @@ EXPORTS krb5_os_localaddr krb5_parse_name krb5_principal_compare + krb5_prompter_posix krb5_rd_cred krb5_rd_error krb5_rd_priv @@ -108,6 +112,7 @@ EXPORTS krb5_timeofday krb5_unparse_name krb5_unparse_name_ext + krb5_free_unparsed_name krb5_us_timeofday krb5_get_server_rcache ; @@ -197,6 +202,7 @@ EXPORTS des_quad_cksum des_string_to_key ; des_set_random_generator_seed + des_init_random_number_generator profile_get_values krb5_random_confounder krb5_size_opaque -- 2.26.2