From: deraadt <deraadt@openbsd.org>
Date: Wed, 16 Jul 2014 00:18:54 +0000 (+0000)
Subject: #ifdef wrap the _rs_forkhandler
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f32ced12d1a21fcb47a27138943a8e3c30d26bd7;p=openbsd

#ifdef wrap the _rs_forkhandler
---

diff --git a/lib/libc/crypt/arc4random.c b/lib/libc/crypt/arc4random.c
index 37b1ad77c18..3b7f34faed5 100644
--- a/lib/libc/crypt/arc4random.c
+++ b/lib/libc/crypt/arc4random.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arc4random.c,v 1.44 2014/07/16 00:15:35 bcook Exp $	*/
+/*	$OpenBSD: arc4random.c,v 1.45 2014/07/16 00:18:54 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996, David Mazieres <dm@uun.org>
@@ -65,12 +65,14 @@ static struct {
 
 static inline void _rs_rekey(u_char *dat, size_t datlen);
 
+#ifndef MAP_INHERIT_ZERO
 static inline void
 _rs_forkhandler(void)
 {
 	if (rs)
 		rs->rs_count = 0;
 }
+#endif /* MAP_INHERIT_ZERO */
 
 static inline void
 _rs_init(u_char *buf, size_t n)