diff options
| author | kaie%kuix.de <devnull@localhost> | 2007-12-03 21:07:01 +0000 |
|---|---|---|
| committer | kaie%kuix.de <devnull@localhost> | 2007-12-03 21:07:01 +0000 |
| commit | 32f8d9f3ba609817109e91d0fec832fcd1db653c (patch) | |
| tree | 261b4f28aa0c60844ec91c8766eab54478d0bb6c | |
| parent | 9c8d32156fa37b1bf0caabc5c0bbd7ab3b820080 (diff) | |
| download | nss-hg-32f8d9f3ba609817109e91d0fec832fcd1db653c.tar.gz | |
Bug 174993, don't fork netstat if data has been gathered from /dev/urandom
r=nelson
| -rw-r--r-- | security/nss/lib/freebl/unix_rand.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/security/nss/lib/freebl/unix_rand.c b/security/nss/lib/freebl/unix_rand.c index 332eeb8a7..b9664583c 100644 --- a/security/nss/lib/freebl/unix_rand.c +++ b/security/nss/lib/freebl/unix_rand.c @@ -972,9 +972,12 @@ void RNG_SystemInfoForRNG(void) * in a pthreads environment. Therefore, we call safe_popen last and on * BSD/OS we do not call safe_popen when we succeeded in getting data * from /dev/urandom. + * + * Bug 174993: LINUX provides /dev/urandom, don't fork netstat + * if data has been gathered successfully */ -#ifdef BSDI +#if defined(BSDI) || defined(LINUX) if (bytes) return; #endif |