* err_handle.c, kdb5.c: Test ENABLE_THREADS, not just HAVE_PTHREAD_H

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

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 740cef0264c224d4f84df2628746084a4ad13c53..bdfc8899d256bb5396dccd1dc3049c317ca8100e 100644 (file)
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-21  Ken Raeburn  <raeburn@mit.edu>
+
+       * err_handle.c, kdb5.c: Test ENABLE_THREADS, not just
+       HAVE_PTHREAD_H.
+
 2005-06-20  Ken Raeburn  <raeburn@mit.edu>
 
        Novell merge.

diff --git a/src/lib/kdb/err_handle.c b/src/lib/kdb/err_handle.c
index b70fbfe79eff61b6a695b0c1c5a2020d8cd64dd7..3130587fdb39f8a330dd051c03f276c65aaa360f 100644 (file)
--- a/src/lib/kdb/err_handle.c
+++ b/src/lib/kdb/err_handle.c
@@ -16,7 +16,7 @@ static char *_csrc =
    safety requirement stops me from putting there.  if I do, then all
    the applications have to link to pthread.  */
 
-#ifdef HAVE_PTHREAD_H
+#if defined(ENABLE_THREADS) && defined(HAVE_PTHREAD_H)
 #include <pthread.h>
 #endif
 #include "err_handle.h"
@@ -34,7 +34,7 @@ typedef struct
     krb5_context kcontext;
 } krb5_err_struct_t;
 
-#ifdef HAVE_PTHREAD_H
+#if defined(ENABLE_THREADS) && defined(HAVE_PTHREAD_H)
 static void
 tsd_key_destructor(void *data)
 {
@@ -138,8 +138,10 @@ static void
 init_err_handling(void)
 {
     if (krb5_init_once) {
+#ifdef NOVELL
        old_error_2_string = error_message;
        error_message = krb5_get_err_string;
+#endif
        krb5_init_once = FALSE;
     }
 }
@@ -189,8 +191,11 @@ krb5_get_err_string(long err_code)
 
     /* It is not generated here. the remaining two cases are handled
        by the default error string convertor.  */
+#ifdef NOVELL
     return old_error_2_string(err_code);
-
+#else
+    return error_message(err_code);
+#endif
 }
 
 void

diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index a79f6e3aaac46a42f994a8edb52001077ec459e2..0d6bded5fb1862673516d4562a0ba5fbae9ac036 100644 (file)
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -2,7 +2,7 @@
  * Include files
  */
 
-#ifdef HAVE_PTHREAD_H
+#if defined(ENABLE_THREADS) && defined(HAVE_PTHREAD_H)
 #include <pthread.h>
 #endif
 
@@ -27,7 +27,7 @@
  * internal static variable
  */
 
-#ifdef HAVE_PTHREAD_H
+#if defined(ENABLE_THREADS) && defined(HAVE_PTHREAD_H)
 /* static pthread_once_t db_inited = PTHREAD_ONCE_INIT; */
 static pthread_mutex_t db_lock = PTHREAD_MUTEX_INITIALIZER;
 #else
@@ -47,7 +47,7 @@ static db_library lib_list;
 /*
  * Helper Functions
  */
-#ifdef HAVE_PTHREAD_H
+#if defined(ENABLE_THREADS) && defined(HAVE_PTHREAD_H)
 
 /* 
  * KNOWN ISSUES with locking: This code does not handle a scenario