pullup from trunk

ticket: 2865
version_fixed: 1.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17005 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 2cf9a974645ce2f53648f5b7cf02f990a57f7414..3a551385b2543b0c23693e26f8b02908d00fecf6 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-04  Jeffrey Altman <jaltman@mit.edu>
+
+        * krb5.hin: add prototype for krb5_is_thread_safe
+
 2004-12-21  Tom Yu  <tlyu@mit.edu>
 
        * krb5.hin: Flag krb5_principal2salt as KRB5_CALLCONV_WRONG.

diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 8cd270975ed765893adec5d861133358c9ffed3a..46f3a143d14b8147420bc9c8781de58db84eaa5e 100644 (file)
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -1369,6 +1369,8 @@ krb5_boolean krb5_is_permitted_enctype
        (krb5_context, krb5_enctype);
 #endif
 
+krb5_boolean KRB5_CALLCONV krb5_is_thread_safe(void);
+
 /* libkrb.spec */
 #if KRB5_PRIVATE
 krb5_error_code krb5_kdc_rep_decrypt_proc

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 11239044dde111806cc5fb21ae9524aac8cc078c..10a156572f9a7b1fecca3e81adea9043767cbca9 100644 (file)
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-03  Jeffrey Altman <jaltman@mit.edu>
+
+        * krb5_32.def: export krb5_is_thread_safe()
+
 2004-12-18  Jeffrey Altman <jaltman@mit.edu>
 
         * krb5_32.def: mark krb5_principal2salt as using the wrong 

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 050d9da7813a141b68fab9a7a38b42d54af62b09..ef206a9bacb3b6b0ff0edbe4e833a4020b948fcd 100644 (file)
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-04  Jeffrey Altman <jaltman@mit.edu>
+      
+        * libkrb5.exports: add krb5_is_thread_safe
+
 2004-08-08  Ken Raeburn  <raeburn@mit.edu>
 
        * libkrb5.exports: Remove memory ccache symbols except ops table.

diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports
index 204296aa34c9c69310020ea434a3f2f531b0e7fa..f16b45cf803082aeb9ae3cbebee52ef75b2a51ff 100644 (file)
--- a/src/lib/krb5/libkrb5.exports
+++ b/src/lib/krb5/libkrb5.exports
@@ -458,6 +458,7 @@ krb5_init_keyblock
 krb5_init_secure_context
 krb5_internalize_opaque
 krb5_is_permitted_enctype
+krb5_is_thread_safe
 krb5_kdc_rep_decrypt_proc
 krb5_kt_add_entry
 krb5_kt_close

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 1c08765036fc93413161c6cc243bb2a308cb9612..00b7cb8358812011b392cd1f4862750028e3ee77 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-03  Jeffrey Altman <jaltman@mit.edu>
+
+        * thread_safe.c: (new file) krb5_is_thread_safe()
+
 2004-12-08  Ken Raeburn  <raeburn@mit.edu>
 
        * accessor.c (krb5int_accessor): Set new field use_dns_kdc.

diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index b2b6fe2d1d8c531d14e84c4005520dce489b560e..c1996839ebbbf923f9ad775c0147e491dbc27286 100644 (file)
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -49,6 +49,7 @@ STLIBOBJS= \
        send524.o       \
        sendto_kdc.o    \
        sn2princ.o      \
+        thread_safe.o   \
        timeofday.o     \
        toffset.o       \
        unlck_file.o    \
@@ -94,6 +95,7 @@ OBJS= \
        $(OUTPRE)send524.$(OBJEXT)      \
        $(OUTPRE)sendto_kdc.$(OBJEXT)   \
        $(OUTPRE)sn2princ.$(OBJEXT)     \
+        $(OUTPRE)thread_safe.$(OBJEXT)  \
        $(OUTPRE)timeofday.$(OBJEXT)    \
        $(OUTPRE)toffset.$(OBJEXT)      \
        $(OUTPRE)unlck_file.$(OBJEXT)   \
@@ -139,6 +141,7 @@ SRCS= \
        $(srcdir)/send524.c     \
        $(srcdir)/sendto_kdc.c  \
        $(srcdir)/sn2princ.c    \
+        $(srcdir)/thread_safe.c \
        $(srcdir)/timeofday.c   \
        $(srcdir)/toffset.c     \
        $(srcdir)/unlck_file.c  \

diff --git a/src/lib/krb5_32.def b/src/lib/krb5_32.def
index 95f8146723a0ec8cf1ee2134b0d47bed73b1b5a4..0125d2630eb3ba75a62ac26808aaedd7870f88df 100644 (file)
--- a/src/lib/krb5_32.def
+++ b/src/lib/krb5_32.def
@@ -168,6 +168,7 @@ krb5_c_string_to_key_with_params
        krb5_init_keyblock
        krb5_init_random_key
        krb5_init_secure_context
+        krb5_is_thread_safe
        krb5_kt_add_entry
        krb5_kt_close
        krb5_kt_default