diff options
| author | djm <> | 2009-04-06 06:33:20 +0000 |
|---|---|---|
| committer | djm <> | 2009-04-06 06:33:20 +0000 |
| commit | ee26f086217016f09154412b171ad62a33a346f6 (patch) | |
| tree | 647f179fa8dcccf50c436cc0165a1d67476a936e /src/lib/libcrypto/rand/randfile.c | |
| parent | f929570d17be2469dc7104fcdf26fdaddf3dbb65 (diff) | |
| download | openbsd-ee26f086217016f09154412b171ad62a33a346f6.tar.gz openbsd-ee26f086217016f09154412b171ad62a33a346f6.tar.bz2 openbsd-ee26f086217016f09154412b171ad62a33a346f6.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/rand/randfile.c')
| -rw-r--r-- | src/lib/libcrypto/rand/randfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c index f63fbc1731..d108353bbc 100644 --- a/src/lib/libcrypto/rand/randfile.c +++ b/src/lib/libcrypto/rand/randfile.c | |||
| @@ -261,7 +261,7 @@ const char *RAND_file_name(char *buf, size_t size) | |||
| 261 | struct stat sb; | 261 | struct stat sb; |
| 262 | #endif | 262 | #endif |
| 263 | 263 | ||
| 264 | if (issetugid() == 0) | 264 | if (OPENSSL_issetugid() == 0) |
| 265 | s=getenv("RANDFILE"); | 265 | s=getenv("RANDFILE"); |
| 266 | if (s != NULL && *s && strlen(s) + 1 < size) | 266 | if (s != NULL && *s && strlen(s) + 1 < size) |
| 267 | { | 267 | { |
| @@ -270,7 +270,7 @@ const char *RAND_file_name(char *buf, size_t size) | |||
| 270 | } | 270 | } |
| 271 | else | 271 | else |
| 272 | { | 272 | { |
| 273 | if (issetugid() == 0) | 273 | if (OPENSSL_issetugid() == 0) |
| 274 | s=getenv("HOME"); | 274 | s=getenv("HOME"); |
| 275 | #ifdef DEFAULT_HOME | 275 | #ifdef DEFAULT_HOME |
| 276 | if (s == NULL) | 276 | if (s == NULL) |