gssapi_krb5.h, copy_ccache.c, get_tkt_flags.c, set_ccache.c: Make the

	krb5 extension functions exportable in a Windows DLL.

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

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 1ad383abf7a52a8671465909d0038fa5ee2723e5..61b9cb5861c054029407f46f5c52b32fd8839266 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,9 @@
+Sat Apr 17 01:23:57 1999  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * gssapi_krb5.h, copy_ccache.c, get_tkt_flags.c, set_ccache.c:
+               Make the krb5 extension functions exportable in a Windows
+               DLL.
+
 Fri Mar 26 22:17:20 1999  Theodore Y. Ts'o  <tytso@mit.edu>
 
        * acquire_cred.c (krb5_gss_acquire_cred): Don't use strcmp to

diff --git a/src/lib/gssapi/krb5/copy_ccache.c b/src/lib/gssapi/krb5/copy_ccache.c
index 8096eecc306529250b113b2cd5ffc64fc7ff8575..96027b4943aca701aa3e76bc45cf11d25aa0c33a 100644 (file)
--- a/src/lib/gssapi/krb5/copy_ccache.c
+++ b/src/lib/gssapi/krb5/copy_ccache.c
@@ -1,6 +1,6 @@
 #include "gssapiP_krb5.h"
 
-OM_uint32
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV 
 gss_krb5_copy_ccache(minor_status, cred_handle, out_ccache)
      OM_uint32 *minor_status;
      gss_cred_id_t cred_handle;

diff --git a/src/lib/gssapi/krb5/get_tkt_flags.c b/src/lib/gssapi/krb5/get_tkt_flags.c
index eebf06d815d7ee6be8158f9827e813a5b57357a0..7dd5d5cc4882231dab1772887d29a98dc95d860f 100644 (file)
--- a/src/lib/gssapi/krb5/get_tkt_flags.c
+++ b/src/lib/gssapi/krb5/get_tkt_flags.c
@@ -26,7 +26,7 @@
  * $Id$
  */
 
-OM_uint32
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV 
 gss_krb5_get_tkt_flags(minor_status, context_handle, ticket_flags)
      OM_uint32 *minor_status;
      gss_ctx_id_t context_handle;

diff --git a/src/lib/gssapi/krb5/gssapi_krb5.h b/src/lib/gssapi/krb5/gssapi_krb5.h
index 5a768b6d5bf5031973dfe77a2439f6da286d8677..13ccf6870ea0c0c0013691f7638ffc9ebf627a9d 100644 (file)
--- a/src/lib/gssapi/krb5/gssapi_krb5.h
+++ b/src/lib/gssapi/krb5/gssapi_krb5.h
@@ -56,27 +56,20 @@ extern const gss_OID_desc krb5_gss_oid_array[];
 #define gss_krb5_nt_machine_uid_name   gss_nt_machine_uid_name
 #define gss_krb5_nt_string_uid_name    gss_nt_string_uid_name
 
-OM_uint32 gss_krb5_get_tkt_flags 
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_krb5_get_tkt_flags 
        PROTOTYPE((OM_uint32 *minor_status,
                   gss_ctx_id_t context_handle,
                   krb5_flags *ticket_flags));
 
-OM_uint32 gss_krb5_copy_ccache
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_krb5_copy_ccache
        PROTOTYPE((OM_uint32 *minor_status,
                   gss_cred_id_t cred_handle,
                   krb5_ccache out_ccache));
 
-OM_uint32 gss_krb5_ccache_name
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_krb5_ccache_name
        PROTOTYPE((OM_uint32 *minor_status, const char *name,
                   const char **out_name));
 
-/* this is for backward compatibility only.  It is declared here for
-   completeness, but should not be used */
-
-OM_uint32 krb5_gss_set_backward_mode
-        PROTOTYPE((OM_uint32 *minor_status,
-                   int mode));
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

diff --git a/src/lib/gssapi/krb5/set_ccache.c b/src/lib/gssapi/krb5/set_ccache.c
index 85a1bc505adbd163d5354c25d5367ac4a3c64161..3732ca78e8ede4a930982a44a938f91baf67b3f5 100644 (file)
--- a/src/lib/gssapi/krb5/set_ccache.c
+++ b/src/lib/gssapi/krb5/set_ccache.c
@@ -1,25 +1,24 @@
 #include "gssapiP_krb5.h"
 
-OM_uint32
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV 
 gss_krb5_ccache_name(minor_status, name, out_name)
        OM_uint32 *minor_status;
        const char *name;
        const char **out_name;
 {
        krb5_context context;
-    krb5_error_code retval;
+       krb5_error_code retval;
 
        if (GSS_ERROR(kg_get_context(minor_status, &context)))
                return (GSS_S_FAILURE);
 
        if (out_name)
                *out_name = krb5_cc_default_name(context);
-       if (name) {
-               retval = krb5_cc_set_default_name(context, name);
-               if (retval) {
-                       *minor_status = retval;
-                       return GSS_S_FAILURE;
-               }
+
+       retval = krb5_cc_set_default_name(context, name);
+       if (retval) {
+               *minor_status = retval;
+               return GSS_S_FAILURE;
        }
        return GSS_S_COMPLETE;
 }