From owner-p4-projects@FreeBSD.ORG Thu Feb 21 16:44:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 621DB16A40D; Thu, 21 Feb 2008 16:44:58 +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 272C616A407 for ; Thu, 21 Feb 2008 16:44:58 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 14FEE13C45D for ; Thu, 21 Feb 2008 16:44:58 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1LGivBh048606 for ; Thu, 21 Feb 2008 16:44:57 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1LGivwY048603 for perforce@freebsd.org; Thu, 21 Feb 2008 16:44:57 GMT (envelope-from csjp@freebsd.org) Date: Thu, 21 Feb 2008 16:44:57 GMT Message-Id: <200802211644.m1LGivwY048603@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 135900 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: Thu, 21 Feb 2008 16:44:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=135900 Change 135900 by csjp@ibm01 on 2008/02/21 16:44:55 Fix bug while processing host XML attribute for extended header tokens. Submitted by: Martin Voros Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#64 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#51 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#64 (text+ko) ==== @@ -6,6 +6,9 @@ event there is an error writing the subject token. This was submitted by Diego Giagio. - Build support for Mac OS X 10.5.1 submitted by Eric Hall. +- Fix a bug which resulted in host XML attributes not being printed + while processing extended header tokens. This patch was submitted by + Martin Voros. OpenBSM 1.0 @@ -311,4 +314,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#63 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#64 $ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#51 (text+ko) ==== @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#50 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#51 $ */ #include @@ -996,12 +996,10 @@ open_attr(fp, "modifier"); print_evmod(fp, tok->tt.hdr32_ex.e_mod, raw); close_attr(fp); - /* - * No attribute for additional types. - * + open_attr(fp, "host"); print_ip_ex_address(fp, tok->tt.hdr32_ex.ad_type, tok->tt.hdr32_ex.addr); - */ + close_attr(fp); open_attr(fp, "time"); print_sec32(fp, tok->tt.hdr32_ex.s, raw); close_attr(fp); @@ -1188,12 +1186,10 @@ open_attr(fp, "modifier"); print_evmod(fp, tok->tt.hdr64_ex.e_mod, raw); close_attr(fp); - /* - * No attribute for additional types. - * + open_attr(fp, "host"); print_ip_ex_address(fp, tok->tt.hdr64_ex.ad_type, tok->tt.hdr64_ex.addr); - */ + close_attr(fp); open_attr(fp, "time"); print_sec64(fp, tok->tt.hdr64_ex.s, raw); close_attr(fp);