D17096.id47838.diff
No OneTemporary
Actions

Size

960 B

Referenced Files

None

Subscribers

None

D17096.id47838.diff
View Options

	Index: lib/geom/eli/geom_eli.c
	===================================================================
	--- lib/geom/eli/geom_eli.c
	+++ lib/geom/eli/geom_eli.c
	@@ -937,9 +937,11 @@
	/* Backupfile given by the user, just copy it. */
	strlcpy(backfile, str, sizeof(backfile));

	- /* Make the backup filename unique if multiple providers
	- * initialized in one command. */
	- if (nargs > 1) {
	+ /* If the backup filename has been specified as anything
	+ * other than "none", and multiple providers have been
	+ * initialized in one command, make the backup filename
	+ * unique for each provider. */
	+ if (strcmp(backfile, "none") != 0 && nargs > 1) {
	/*
	* Replace first occurrence of "PROV" with
	* provider name.
	@@ -1003,7 +1005,6 @@
	* providers are initialized with unique metadata.
	*/
	explicit_bzero(key, sizeof(key));
	- explicit_bzero(&md, sizeof(md));
	}

	/* Clear the cached metadata, including keys. */