From owner-p4-projects@FreeBSD.ORG  Fri Apr 15 01:38:11 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A9BD516A4D0; Fri, 15 Apr 2005 01:38:09 +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 5365116A4CE
	for <perforce@freebsd.org>; Fri, 15 Apr 2005 01:38:09 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 385F043D1F
	for <perforce@freebsd.org>; Fri, 15 Apr 2005 01:38:09 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3F1c9B0017260
	for <perforce@freebsd.org>; Fri, 15 Apr 2005 01:38:09 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3F1c8VC017257
	for perforce@freebsd.org; Fri, 15 Apr 2005 01:38:08 GMT
	(envelope-from wsalamon@computer.org)
Date: Fri, 15 Apr 2005 01:38:08 GMT
Message-Id: <200504150138.j3F1c8VC017257@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wsalamon@computer.org using -f
From: Wayne Salamon <wsalamon@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 75224 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, 15 Apr 2005 01:38:11 -0000

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

Change 75224 by wsalamon@rickenbacker on 2005/04/15 01:37:42

	Fix a bug where, if the execv() fails, the child process hangs around.
	In the audit_warn case, the execv() will fail if the audit_warn script
	doesn't have the execute bit turned on, for example.

Affected files ...

.. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/audit_warn.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/audit_warn.c#3 (text+ko) ====

@@ -34,6 +34,7 @@
 	char *loc_args[9];
 	int i;
 	pid_t pid;
+
 	loc_args[0] = AUDITWARN_SCRIPT;
 	for (i = 0; args[i] != NULL && i < 8; i++) {
 		loc_args[i+1] = args[i];
@@ -41,13 +42,13 @@
 	loc_args[i+1] = NULL;
         
 	pid = fork();
-	if (pid == 0) {
-	return execv(AUDITWARN_SCRIPT, loc_args);
-		/* not reached */
-		exit(1);
+	if (pid == 0) {		// child
+		execv(AUDITWARN_SCRIPT, loc_args);
+		syslog(LOG_ERR, "Could not exec %s\n", AUDITWARN_SCRIPT);
+		exit (1);	// if we reach here, the exec failed
 	} else if (pid == -1) {
 		return -1;
-	} else {
+	} else {		// parent
 		return 0;
 	}
 }