From owner-p4-projects@FreeBSD.ORG  Mon Aug  7 22:46:53 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B357E16A4E1; Mon,  7 Aug 2006 22:46:53 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 72DC316A4DA
	for <perforce@freebsd.org>; Mon,  7 Aug 2006 22:46:53 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 28B0243D53
	for <perforce@freebsd.org>; Mon,  7 Aug 2006 22:46:53 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k77MkrOa077938
	for <perforce@freebsd.org>; Mon, 7 Aug 2006 22:46:53 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k77MkrCj077927
	for perforce@freebsd.org; Mon, 7 Aug 2006 22:46:53 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 7 Aug 2006 22:46:53 GMT
Message-Id: <200608072246.k77MkrCj077927@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 103407 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Aug 2006 22:46:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=103407

Change 103407 by jb@jb_freebsd2 on 2006/08/07 22:46:36

	IFC

Affected files ...

.. //depot/projects/dtrace/src/lib/libc/gen/syslog.c#4 integrate
.. //depot/projects/dtrace/src/sbin/geom/class/eli/geom_eli.c#4 integrate

Differences ...

==== //depot/projects/dtrace/src/lib/libc/gen/syslog.c#4 (text+ko) ====

@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)syslog.c	8.5 (Berkeley) 4/29/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.37 2006/05/11 09:10:33 davidxu Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.38 2006/08/07 20:12:18 phk Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
@@ -116,7 +116,7 @@
 		h->base += len;
 		h->left -= len;
 	}
-	return 0;
+	return len;
 }
 
 /*

==== //depot/projects/dtrace/src/sbin/geom/class/eli/geom_eli.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.12 2006/06/06 22:06:24 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.13 2006/08/07 20:09:09 pjd Exp $");
 
 #include <stdio.h>
 #include <stdint.h>
@@ -393,7 +393,7 @@
 			}
 		}
 		/*
-		 * If md_iterations is equal to 0, user don't want PKCS5v2.
+		 * If md_iterations is equal to 0, user don't want PKCS#5v2.
 		 */
 		if (md->md_iterations == 0) {
 			g_eli_crypto_hmac_update(&ctx, md->md_salt,