svn commit: r235496 - in stable/7: sbin/geom/class/eli sys/geom/eli

Eitan Adler eadler at FreeBSD.org
Wed May 16 00:36:52 UTC 2012


Author: eadler
Date: Wed May 16 00:36:51 2012
New Revision: 235496
URL: http://svn.freebsd.org/changeset/base/235496

Log:
  MFC r235201 r235419:
  	 Add missing period at the end of the error message
  
  Approved by:	cperciva (implicit)

Modified:
  stable/7/sbin/geom/class/eli/geli.8
  stable/7/sys/geom/eli/g_eli_integrity.c
Directory Properties:
  stable/7/sbin/geom/   (props changed)
  stable/7/sys/   (props changed)

Modified: stable/7/sbin/geom/class/eli/geli.8
==============================================================================
--- stable/7/sbin/geom/class/eli/geli.8	Wed May 16 00:29:26 2012	(r235495)
+++ stable/7/sbin/geom/class/eli/geli.8	Wed May 16 00:36:51 2012	(r235496)
@@ -649,6 +649,9 @@ will not protect your data against repla
 It is recommended to write the whole provider before the first use,
 in order to make sure that all sectors and their corresponding
 checksums are properly initialized into a consistent state.
+One can safely ignore data authentication errors that occur immediately
+after the first time a provider is attached and before it is
+initialized in this way.
 .Sh SEE ALSO
 .Xr crypto 4 ,
 .Xr gbde 4 ,

Modified: stable/7/sys/geom/eli/g_eli_integrity.c
==============================================================================
--- stable/7/sys/geom/eli/g_eli_integrity.c	Wed May 16 00:29:26 2012	(r235495)
+++ stable/7/sys/geom/eli/g_eli_integrity.c	Wed May 16 00:36:51 2012	(r235496)
@@ -204,8 +204,8 @@ g_eli_auth_read_done(struct cryptop *crp
 				 * Report previous corruption if there was one.
 				 */
 				if (coroff != -1) {
-					G_ELI_DEBUG(0, "%s: %jd bytes "
-					    "corrupted at offset %jd.",
+					G_ELI_DEBUG(0, "%s: Failed to authenticate %jd "
+					    "bytes of data at offset %jd.",
 					    sc->sc_name, (intmax_t)corsize,
 					    (intmax_t)coroff);
 					coroff = -1;
@@ -220,7 +220,8 @@ g_eli_auth_read_done(struct cryptop *crp
 		}
 		/* Report previous corruption if there was one. */
 		if (coroff != -1) {
-			G_ELI_DEBUG(0, "%s: %jd bytes corrupted at offset %jd.",
+			G_ELI_DEBUG(0, "%s: Failed to authenticate %jd "
+			    "bytes of data at offset %jd.",
 			    sc->sc_name, (intmax_t)corsize, (intmax_t)coroff);
 		}
 	}


More information about the svn-src-stable mailing list