Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11787. OpensslSecureRandom.c pthread_threadid_np usage signature is wrong on 32-bit Mac. Contributed by Kiran Kumar M R. 

(cherry picked from commit a3a96a07fa)
(cherry picked from commit 726024faa5)
This commit is contained in:
cnauroth 2015-04-01 11:40:09 -07:00
parent 3acfde6d85
commit aa326086cc
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -713,6 +713,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11754. RM fails to start in non-secure mode due to authentication HADOOP-11754. RM fails to start in non-secure mode due to authentication
filter failure. (wheat9) filter failure. (wheat9)
HADOOP-11787. OpensslSecureRandom.c pthread_threadid_np usage signature is
wrong on 32-bit Mac. (Kiran Kumar M R via cnauroth)
Release 2.6.1 - UNRELEASED Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
View File

@ -286,7 +286,9 @@ static unsigned long pthreads_thread_id(void)
#elif defined(__sun) #elif defined(__sun)
thread_id = (unsigned long)pthread_self(); thread_id = (unsigned long)pthread_self();
#elif defined(__APPLE__) #elif defined(__APPLE__)
(void)pthread_threadid_np(pthread_self(), &thread_id); __uint64_t tmp_thread_id;
(void)pthread_threadid_np(pthread_self(), &tmp_thread_id);
thread_id = (unsigned long)tmp_thread_id;
#else #else
#error "Platform not supported" #error "Platform not supported"
#endif #endif