From owner-p4-projects@FreeBSD.ORG  Fri Mar 11 13:29:27 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C744416A4D0; Fri, 11 Mar 2005 13:29:26 +0000 (GMT)
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 8329A16A4CE
	for <perforce@freebsd.org>; Fri, 11 Mar 2005 13:29:26 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 56B6743D31
	for <perforce@freebsd.org>; Fri, 11 Mar 2005 13:29:26 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2BDTQ2W004564
	for <perforce@freebsd.org>; Fri, 11 Mar 2005 13:29:26 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2BDTQn6004561
	for perforce@freebsd.org; Fri, 11 Mar 2005 13:29:26 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 11 Mar 2005 13:29:26 GMT
Message-Id: <200503111329.j2BDTQn6004561@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 72897 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Fri, 11 Mar 2005 13:29:27 -0000

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

Change 72897 by rwatson@rwatson_tislabs on 2005/03/11 13:29:08

	Fix error in merge.

Affected files ...

.. //depot/projects/trustedbsd/mac/usr.sbin/syslogd/syslogd.c#27 edit

Differences ...

==== //depot/projects/trustedbsd/mac/usr.sbin/syslogd/syslogd.c#27 (text+ko) ====

@@ -515,7 +515,7 @@
 				error = 1;
 		}
 		if (!error) {
-			if (chmod(fx->s, 0666) < 0)
+			if (chmod(fx->name, 0666) < 0)
 				error = 1;
 		}
 		if (!error) {