svn commit: r185426 - stable/7/sys/fs/cd9660

[Tim Kientzle]

Author: kientzle
Date: Sat Nov 29 05:10:30 2008
New Revision: 185426
URL: http://svn.freebsd.org/changeset/base/185426

Log:
  MFC r185334: Recognize Rockridge extensions even when the
  IEEE-standard extension name (as standardized in 1994) is used.
  
  PR:		kern/128942
  Submitted by:	J.R. Oldroyd
  Approved by:	re

Modified:
  stable/7/sys/fs/cd9660/cd9660_rrip.c

Modified: stable/7/sys/fs/cd9660/cd9660_rrip.c
==============================================================================
--- stable/7/sys/fs/cd9660/cd9660_rrip.c	Sat Nov 29 05:08:49 2008	(r185425)
+++ stable/7/sys/fs/cd9660/cd9660_rrip.c	Sat Nov 29 05:10:30 2008	(r185426)
@@ -467,8 +467,12 @@ cd9660_rrip_extref(p,ana)
 	ISO_RRIP_EXTREF *p;
 	ISO_RRIP_ANALYZE *ana;
 {
-	if (isonum_711(p->len_id) != 10
-	    || bcmp((char *)p + 8,"RRIP_1991A",10)
+	if ( ! ((isonum_711(p->len_id) == 10
+	      && bcmp((char *)p + 8,"RRIP_1991A",10) == 0)
+	    || (isonum_711(p->len_id) == 10
+	      && bcmp((char *)p + 8,"IEEE_P1282",10) == 0)
+	    || (isonum_711(p->len_id) ==  9
+	      && bcmp((char *)p + 8,"IEEE_1282",  9) == 0))
 	    || isonum_711(p->version) != 1)
 		return 0;
 	ana->fields &= ~ISO_SUSP_EXTREF;