From owner-svn-src-all@FreeBSD.ORG  Fri Aug 28 19:48:07 2009
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 3CE82106564A;
	Fri, 28 Aug 2009 19:48:07 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B2878FC15;
	Fri, 28 Aug 2009 19:48:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7SJm6uR034606;
	Fri, 28 Aug 2009 19:48:06 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7SJm6PZ034604;
	Fri, 28 Aug 2009 19:48:06 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200908281948.n7SJm6PZ034604@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 28 Aug 2009 19:48:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196625 - in stable/8/lib/libc: . db/hash
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: Fri, 28 Aug 2009 19:48:07 -0000

Author: delphij
Date: Fri Aug 28 19:48:06 2009
New Revision: 196625
URL: http://svn.freebsd.org/changeset/base/196625

Log:
  MFC r196525:
  
  Consider flag == 0 as the same of flag == R_NEXT.  This change will restore
  a historical behavior that has been changed by revision 190491, and has seen
  to break exim.
  
  Approved by:	re (kib)

Modified:
  stable/8/lib/libc/   (props changed)
  stable/8/lib/libc/db/hash/hash.c

Modified: stable/8/lib/libc/db/hash/hash.c
==============================================================================
--- stable/8/lib/libc/db/hash/hash.c	Fri Aug 28 19:18:20 2009	(r196624)
+++ stable/8/lib/libc/db/hash/hash.c	Fri Aug 28 19:48:06 2009	(r196625)
@@ -711,7 +711,7 @@ hash_seq(const DB *dbp, DBT *key, DBT *d
 		hashp->cndx = 1;
 		hashp->cpage = NULL;
 	}
- next_bucket:
+next_bucket:
 	for (bp = NULL; !bp || !bp[0]; ) {
 		if (!(bufp = hashp->cpage)) {
 			for (bucket = hashp->cbucket;
@@ -732,7 +732,7 @@ hash_seq(const DB *dbp, DBT *key, DBT *d
 			}
 		} else {
 			bp = (u_int16_t *)hashp->cpage->page;
-			if (flag == R_NEXT) {
+			if (flag == R_NEXT || flag == 0) {
 				hashp->cndx += 2;
 				if (hashp->cndx > bp[0]) {
 					hashp->cpage = NULL;