From owner-p4-projects@FreeBSD.ORG Tue Mar 1 10:10:24 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 558791065674; Tue, 1 Mar 2011 10:10:24 +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 17B9D106566C for ; Tue, 1 Mar 2011 10:10:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id DF7AC8FC12 for ; Tue, 1 Mar 2011 10:10:23 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p21AANHx002792 for ; Tue, 1 Mar 2011 10:10:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p21AANYs002788 for perforce@freebsd.org; Tue, 1 Mar 2011 10:10:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 1 Mar 2011 10:10:23 GMT Message-Id: <201103011010.p21AANYs002788@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 189324 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2011 10:10:24 -0000 http://p4web.freebsd.org/@@189324?ac=10 Change 189324 by rwatson@rwatson_cinnamon on 2011/03/01 10:09:40 Attempt to fix merge of upriv/privset tokens, bsm_io.c should now build again. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#67 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#67 (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#66 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#67 $ */ #include @@ -3381,12 +3381,11 @@ } static void -print_upriv_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, - __unused char sfrm, int xml) +print_upriv_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) { - print_tok_type(fp, tok->id, "use of privilege", raw, xml); - if (xml) { + print_tok_type(fp, tok->id, "use of privilege", oflags); + if (oflags & AU_OFLAG_XML) { open_attr(fp, "status"); if (tok->tt.priv.sorf) (void) fprintf(fp, "successful use of priv"); @@ -3394,8 +3393,7 @@ (void) fprintf(fp, "failed use of priv"); close_attr(fp); open_attr(fp, "name"); - print_string(fp, tok->tt.priv.priv, - tok->tt.priv.privstrlen); + print_string(fp, tok->tt.priv.priv, tok->tt.priv.privstrlen); close_attr(fp); close_tag(fp, tok->id); } else { @@ -3405,8 +3403,7 @@ else (void) fprintf(fp, "failed use of priv"); print_delim(fp, del); - print_string(fp, tok->tt.priv.priv, - tok->tt.priv.privstrlen); + print_string(fp, tok->tt.priv.priv, tok->tt.priv.privstrlen); } } @@ -3464,11 +3461,11 @@ } static void -print_privset_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, - __unused char sfrm, int xml) +print_privset_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) { - print_tok_type(fp, tok->id, "privilege", raw, xml); - if (xml) { + + print_tok_type(fp, tok->id, "privilege", oflags); + if (oflags & AU_OFLAG_XML) { open_attr(fp, "type"); print_string(fp, tok->tt.privset.privtstr, tok->tt.privset.privtstrlen); @@ -4398,11 +4395,11 @@ return; case AUT_UPRIV: - print_upriv_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); + print_upriv_tok(outfp, tok, del, oflags); return; case AUT_PRIV: - print_privset_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); + print_privset_tok(outfp, tok, del, oflags); return; default: @@ -4554,14 +4551,6 @@ } break; - case AUT_UPRIV: - print_upriv_tok(outfp, tok, del, raw, sfrm, AU_XML); - return; - - case AUT_PRIV: - print_privset_tok(outfp, tok, del, raw, sfrm, AU_XML); - return; - default: errno = EINVAL; return (-1);