Export krb5_get_permitted_enctypes and krb5_set_real_time for Samba

ticket: 1655

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index a0feb8fcda58fd658aec30ebb1e25cc925d7603f..e5cae29c5068be323f92f5e2a6e605f3de718dd2 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-09  Alexandra Ellwood  <lxs@mit.edu>
+
+        * krb5.hin: Export krb5_get_permitted_enctypes and 
+        krb5_set_real_time for Samba.
+
 2003-06-23  Ken Raeburn  <raeburn@mit.edu>
 
        * k5-int.h (struct krb5_cksumtypes): Add new field trunc_size.

diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index a4d7c521f43a4473de0fc349be89c9fcfeae828a..b62fa898690d452240ba6d561449d5f308f53299 100644 (file)
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -1410,9 +1410,12 @@ krb5_error_code KRB5_CALLCONV krb5_get_tgs_ktypes
        (krb5_context,
                krb5_const_principal,
                krb5_enctype **);
+#endif
 
-krb5_error_code krb5_get_permitted_enctypes
+krb5_error_code KRB5_CALLCONV krb5_get_permitted_enctypes
        (krb5_context, krb5_enctype **);
+
+#if KRB5_PRIVATE
 void KRB5_CALLCONV krb5_free_ktypes
        (krb5_context, krb5_enctype *);
 
@@ -2314,9 +2317,12 @@ krb5_error_code krb5_make_fulladdr
                krb5_address *,
                krb5_address *,
                krb5_address *);
+#endif
 
-krb5_error_code krb5_set_real_time
+krb5_error_code KRB5_CALLCONV krb5_set_real_time
        (krb5_context, krb5_int32, krb5_int32);
+
+#if KRB5_PRIVATE
 krb5_error_code krb5_set_debugging_time
        (krb5_context, krb5_int32, krb5_int32);
 krb5_error_code krb5_use_natural_time

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 63f623222f4ad95cdcb09abaf2e6ae0fca03363e..4490552ad956374c6b4abd02c56726fa1395734a 100644 (file)
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-09  Alexandra Ellwood  <lxs@mit.edu>
+
+        * krb5_32.def: Export krb5_get_permitted_enctypes and 
+        krb5_set_real_time for Samba.
+
 2003-05-27  Ken Raeburn  <raeburn@mit.edu>
 
        * krb5_32.def: Add krb5_524_convert_creds.

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 514081343dfc1576d95c6d6bf55d71409fc9592b..770d1f8bf2f38b5f8d0eba0b531bdec34ecd5716 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-03  Alexandra Ellwood  <lxs@mit.edu>
+
+        * init_ctx.c: Export krb5_get_permitted_enctypes for Samba.
+
 2003-06-27  Tom Yu  <tlyu@mit.edu>
 
        * gic_keytab.c (krb5_get_in_tkt_with_keytab): Pass (void*)keytab,

diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index 2b9bcb84fcf77180b5ef7fcc31b506a24a651e10..7ff983cf7a021e6a83bbc589cdbd6850738b187f 100644 (file)
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -449,7 +449,7 @@ krb5_get_tgs_ktypes(krb5_context context, krb5_const_principal princ, krb5_encty
                                      context->tgs_ktypes));
 }
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_get_permitted_enctypes(krb5_context context, krb5_enctype **ktypes)
 {
     return(get_profile_etype_list(context, ktypes, "permitted_enctypes",

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 5a0d718a10c7c564659fe02f72777d991b1f78ed..fcfccce2b9d999e0a4d4d9bd6c0aab7d606ada77 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-09  Alexandra Ellwood  <lxs@mit.edu>
+
+        * toffset.c: Export krb5_set_real_time for Samba.
+
 2003-06-06  Ken Raeburn  <raeburn@mit.edu>
 
        * locate_kdc.c (struct srv_dns_entry): Moved to k5-int.h.

diff --git a/src/lib/krb5/os/toffset.c b/src/lib/krb5/os/toffset.c
index aad995a18491974dfd4b00c7cec35fdedef50014..4578f822af016c2ec8560d6a43cec20d76c826be 100644 (file)
--- a/src/lib/krb5/os/toffset.c
+++ b/src/lib/krb5/os/toffset.c
@@ -35,7 +35,7 @@
  * between the system time and the "real time" as passed to this
  * routine
  */
-krb5_error_code 
+krb5_error_code KRB5_CALLCONV
 krb5_set_real_time(krb5_context context, krb5_int32 seconds, krb5_int32 microseconds)
 {
     krb5_os_context os_ctx = context->os_context;

diff --git a/src/lib/krb5_32.def b/src/lib/krb5_32.def
index 78df9a3992e9a34afe9498d8686629fdabc29364..fd282cf273ef76ac938d273051d4ca7070dfa97e 100644 (file)
--- a/src/lib/krb5_32.def
+++ b/src/lib/krb5_32.def
@@ -158,6 +158,7 @@ krb5_c_string_to_key_with_params
        krb5_get_init_creds_opt_set_salt
        krb5_get_init_creds_opt_set_tkt_life
        krb5_get_init_creds_password
+       krb5_get_permitted_enctypes
        krb5_get_prompt_types
        krb5_get_renewed_creds
        krb5_get_server_rcache
@@ -212,6 +213,7 @@ krb5_c_string_to_key_with_params
 krb5_set_password
 krb5_set_password_using_ccache
        krb5_set_principal_realm
+       krb5_set_real_time
        krb5_sname_to_principal
        krb5_string_to_cksumtype
        krb5_string_to_deltat

diff --git a/src/mac/MacOSX/Projects/Kerberos5.pbexp b/src/mac/MacOSX/Projects/Kerberos5.pbexp
index 6464ef74b06a704cfc8f2754ee3fd5058769d2ee..6cae45313a9e491c2faa142a1437189e3f7d5bc9 100644 (file)
--- a/src/mac/MacOSX/Projects/Kerberos5.pbexp
+++ b/src/mac/MacOSX/Projects/Kerberos5.pbexp
@@ -126,6 +126,7 @@
        _krb5_verify_init_creds_opt_set_ap_req_nofail
 #
        _krb5_set_default_tgs_enctypes
+       _krb5_get_permitted_enctypes
 #
        _krb5_free_tgt_creds
 #
@@ -238,6 +239,7 @@
        _krb5_kuserok
 #
        _krb5_get_time_offsets
+       _krb5_set_real_time
 #
        _krb5_string_to_cksumtype
        _krb5_cksumtype_to_string