From owner-p4-projects@FreeBSD.ORG Sun Jun 29 16:24:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 686791065673; Sun, 29 Jun 2008 16:24:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10EFC1065681 for ; Sun, 29 Jun 2008 16:24:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F14728FC17 for ; Sun, 29 Jun 2008 16:24:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5TGO7dc067385 for ; Sun, 29 Jun 2008 16:24:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5TGO76U067383 for perforce@freebsd.org; Sun, 29 Jun 2008 16:24:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jun 2008 16:24:07 GMT Message-Id: <200806291624.m5TGO76U067383@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 To: Perforce Change Reviews Cc: Subject: PERFORCE change 144286 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2008 16:24:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=144286 Change 144286 by rwatson@rwatson_fledge on 2008/06/29 16:24:00 Employ style(9) in new Mach-centric parts of auditd. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#29 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#29 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#28 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#29 $ */ #include @@ -788,41 +788,42 @@ #define MAX_MSG_SIZE 4096 static boolean_t -auditd_combined_server(mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP) +auditd_combined_server(mach_msg_header_t *InHeadP, + mach_msg_header_t *OutHeadP) { - mach_port_t local_port = InHeadP->msgh_local_port; + mach_port_t local_port = InHeadP->msgh_local_port; - if (local_port == signal_port) { - int signo = InHeadP->msgh_id; - int ret; + if (local_port == signal_port) { + int signo = InHeadP->msgh_id; + int ret; - switch(signo) { - case SIGTERM: - ret = close_all(); - exit(ret); + switch(signo) { + case SIGTERM: + ret = close_all(); + exit(ret); - case SIGCHLD: - handle_sigchld(); - return (TRUE); + case SIGCHLD: + handle_sigchld(); + return (TRUE); - case SIGHUP: - handle_sighup(); - return (TRUE); + case SIGHUP: + handle_sighup(); + return (TRUE); - default: - syslog(LOG_INFO, "Received signal %d", signo); - return (TRUE); - } - } else if (local_port == control_port) { - boolean_t result; + default: + syslog(LOG_INFO, "Received signal %d", signo); + return (TRUE); + } + } else if (local_port == control_port) { + boolean_t result; - result = audit_triggers_server(InHeadP, OutHeadP); - if (!result) - result = auditd_control_server(InHeadP, OutHeadP); - return (result); - } - syslog(LOG_INFO, "Recevied msg on bad port 0x%x.", local_port); - return (FALSE); + result = audit_triggers_server(InHeadP, OutHeadP); + if (!result) + result = auditd_control_server(InHeadP, OutHeadP); + return (result); + } + syslog(LOG_INFO, "Recevied msg on bad port 0x%x.", local_port); + return (FALSE); } static int @@ -832,8 +833,8 @@ result = mach_msg_server(auditd_combined_server, MAX_MSG_SIZE, port_set, MACH_MSG_OPTION_NONE); - syslog(LOG_ERR, "abnormal exit\n"); - return (close_all()); + syslog(LOG_ERR, "abnormal exit\n"); + return (close_all()); } #else /* ! USE_MACH_IPC */ @@ -992,51 +993,48 @@ /* * Allocate a port set - */ - if (mach_port_allocate(mach_task_self(), - MACH_PORT_RIGHT_PORT_SET, - &port_set) != KERN_SUCCESS) { - syslog(LOG_ERR, "Allocation of port set failed"); - fail_exit(); - } + */ + if (mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_PORT_SET, + &port_set) != KERN_SUCCESS) { + syslog(LOG_ERR, "Allocation of port set failed"); + fail_exit(); + } + + /* + * Allocate a signal reflection port + */ + if (mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, + &signal_port) != KERN_SUCCESS || + mach_port_move_member(mach_task_self(), signal_port, port_set) != + KERN_SUCCESS) { + syslog(LOG_ERR, "Allocation of signal port failed"); + fail_exit(); + } + + /* + * Allocate a trigger port + */ + if (mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, + &control_port) != KERN_SUCCESS || + mach_port_move_member(mach_task_self(), control_port, port_set) + != KERN_SUCCESS) + syslog(LOG_ERR, "Allocation of trigger port failed"); /* - * Allocate a signal reflection port - */ - if (mach_port_allocate(mach_task_self(), - MACH_PORT_RIGHT_RECEIVE, - &signal_port) != KERN_SUCCESS || - mach_port_move_member(mach_task_self(), - signal_port, - port_set) != KERN_SUCCESS) { - syslog(LOG_ERR, "Allocation of signal port failed"); - fail_exit(); - } + * Create a send right on our trigger port. + */ + mach_port_extract_right(mach_task_self(), control_port, + MACH_MSG_TYPE_MAKE_SEND, &control_port, &poly); /* - *Allocate a trigger port - */ - if (mach_port_allocate(mach_task_self(), - MACH_PORT_RIGHT_RECEIVE, - &control_port) != KERN_SUCCESS || - mach_port_move_member(mach_task_self(), - control_port, - port_set) != KERN_SUCCESS) { - syslog(LOG_ERR, "Allocation of trigger port failed"); - fail_exit(); - } - /* create a send right on our trigger port */ - mach_port_extract_right(mach_task_self(), control_port, - MACH_MSG_TYPE_MAKE_SEND, &control_port, &poly); - - /* register the trigger port with the kernel */ - if (host_set_audit_control_port(mach_host_self(), control_port) != + * Register the trigger port with the kernel. + */ + if (host_set_audit_control_port(mach_host_self(), control_port) != KERN_SUCCESS) { - syslog(LOG_ERR, "Cannot set Mach control port"); - fail_exit(); - } - else - syslog(LOG_DEBUG, "Mach control port registered"); + syslog(LOG_ERR, "Cannot set Mach control port"); + fail_exit(); + } else + syslog(LOG_DEBUG, "Mach control port registered"); } #endif /* USE_MACH_IPC */