svn commit: r285255 - stable/10/sys/geom/eli

[Glen Barber]

Author: gjb
Date: Tue Jul  7 20:36:48 2015
New Revision: 285255
URL: https://svnweb.freebsd.org/changeset/base/285255

Log:
  Revert r285249, pending further investigation on how the build
  broke.
  
  Approved by:	re (implicit)
  Pointyhat:	gjb (self)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/geom/eli/g_eli.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/geom/eli/g_eli.c
==============================================================================
--- stable/10/sys/geom/eli/g_eli.c	Tue Jul  7 20:31:09 2015	(r285254)
+++ stable/10/sys/geom/eli/g_eli.c	Tue Jul  7 20:36:48 2015	(r285255)
@@ -99,25 +99,6 @@ SYSCTL_UINT(_kern_geom_eli, OID_AUTO, bo
     &g_eli_boot_passcache, 0,
     "Passphrases are cached during boot process for possible reuse");
 static void
-fetch_loader_passphrase(void * dummy)
-{
-	char * env_passphrase;
-
-	KASSERT(dynamic_kenv, ("need dynamic kenv"));
-
-	if ((env_passphrase = kern_getenv("kern.geom.eli.passphrase")) != NULL) {
-		/* Extract passphrase from the environment. */
-		strlcpy(cached_passphrase, env_passphrase,
-		    sizeof(cached_passphrase));
-		freeenv(env_passphrase);
-
-		/* Wipe the passphrase from the environment. */
-		kern_unsetenv("kern.geom.eli.passphrase");
-	}
-}
-SYSINIT(geli_fetch_loader_passphrase, SI_SUB_KMEM + 1, SI_ORDER_ANY,
-    fetch_loader_passphrase, NULL);
-static void
 zero_boot_passcache(void * dummy)
 {