Module Name: src
Committed By: snj
Date: Mon Oct 23 18:57:12 UTC 2017
Modified Files:
src/sys/dev/sysmon [netbsd-7]: sysmon_envsys.c
Log Message:
Apply patch (requested by pgoyette in ticket #1511):
Detach the rndsrc before re-attaching it.
To generate a diff of this commit:
cvs rdiff -u -r1.127.2.1 -r1.127.2.2 src/sys/dev/sysmon/sysmon_envsys.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.127.2.1 src/sys/dev/sysmon/sysmon_envsys.c:1.127.2.2
--- src/sys/dev/sysmon/sysmon_envsys.c:1.127.2.1 Mon Apr 6 18:45:30 2015
+++ src/sys/dev/sysmon/sysmon_envsys.c Mon Oct 23 18:57:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.127.2.1 2015/04/06 18:45:30 snj Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.127.2.2 2017/10/23 18:57:12 snj Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.127.2.1 2015/04/06 18:45:30 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.127.2.2 2017/10/23 18:57:12 snj Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -1207,6 +1207,12 @@ sme_remove_userprops(void)
}
/*
+ * Detach from entropy collection
+ */
+ if (edata->flags & ENVSYS_FHAS_ENTROPY)
+ rnd_detach_sources(&edata->rnd_src);
+
+ /*
* Finally, remove any old limits event, then
* install a new event (which will update the
* dictionary)
