提交 10bf5068 编写于 作者: R Rebecca Cran 提交者: Pauli

Swap #if blocks in uid.c so target platform gets checked before host

This avoids the case where a UEFI build on FreeBSD tries to call the system
issetugid function instead of returning 0 as it should do.

CLA: trivial
Reviewed-by: NRichard Levitte <levitte@openssl.org>
Reviewed-by: NPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9158)
上级 ea5d4b89
...@@ -10,20 +10,20 @@ ...@@ -10,20 +10,20 @@
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include <openssl/opensslconf.h> #include <openssl/opensslconf.h>
#if defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2) || defined(__DragonFly__) #if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
# include OPENSSL_UNISTD
int OPENSSL_issetugid(void) int OPENSSL_issetugid(void)
{ {
return issetugid(); return 0;
} }
#elif defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI) #elif defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2) || defined(__DragonFly__)
# include OPENSSL_UNISTD
int OPENSSL_issetugid(void) int OPENSSL_issetugid(void)
{ {
return 0; return issetugid();
} }
#else #else
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册