From owner-svn-src-all@FreeBSD.ORG  Sat Nov 29 05:08:50 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1D91A1065670;
	Sat, 29 Nov 2008 05:08:50 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 03B1F8FC0A;
	Sat, 29 Nov 2008 05:08:50 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAT58n7c039680;
	Sat, 29 Nov 2008 05:08:49 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAT58nx1039679;
	Sat, 29 Nov 2008 05:08:49 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200811290508.mAT58nx1039679@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sat, 29 Nov 2008 05:08:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185425 - releng/7.1/sys/fs/cd9660
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Nov 2008 05:08:50 -0000

Author: kientzle
Date: Sat Nov 29 05:08:49 2008
New Revision: 185425
URL: http://svn.freebsd.org/changeset/base/185425

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:
  releng/7.1/sys/fs/cd9660/cd9660_rrip.c

Modified: releng/7.1/sys/fs/cd9660/cd9660_rrip.c
==============================================================================
--- releng/7.1/sys/fs/cd9660/cd9660_rrip.c	Sat Nov 29 03:21:25 2008	(r185424)
+++ releng/7.1/sys/fs/cd9660/cd9660_rrip.c	Sat Nov 29 05:08:49 2008	(r185425)
@@ -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;