From owner-p4-projects@FreeBSD.ORG  Wed May  7 06:17:26 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F14D537B404; Wed,  7 May 2003 06:17:25 -0700 (PDT)
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 950D237B401
	for <perforce@freebsd.org>; Wed,  7 May 2003 06:17:25 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3B1A543F75
	for <perforce@freebsd.org>; Wed,  7 May 2003 06:17:25 -0700 (PDT)
	(envelope-from cvance@tislabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47DHP0U029087
	for <perforce@freebsd.org>; Wed, 7 May 2003 06:17:25 -0700 (PDT)
	(envelope-from cvance@tislabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47DHOiq029084
	for perforce@freebsd.org; Wed, 7 May 2003 06:17:24 -0700 (PDT)
Date: Wed, 7 May 2003 06:17:24 -0700 (PDT)
Message-Id: <200305071317.h47DHOiq029084@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cvance@tislabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 30690 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: Wed, 07 May 2003 13:17:27 -0000

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

Change 30690 by cvance@cvance_demo on 2003/05/07 06:16:32

	Allow ugidfw to add rules without requiring a rule number, 
	just use the next empty slot.

Affected files ...

.. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#9 edit
.. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.h#5 edit

Differences ...

==== //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#9 (text+ko) ====

@@ -708,3 +708,40 @@
 
 	return (0);
 }
+
+int
+bsde_add_rule(struct mac_bsdextended_rule *rule, size_t buflen, char *errstr)
+{
+	char charstr[BUFSIZ];
+	int name[10];
+	size_t len, size;
+	int error, rule_slots;
+
+	len = 10;
+	error = bsde_get_mib(MIB ".rules", name, &len);
+	if (error) {
+		len = snprintf(errstr, buflen, "%s: %s", MIB ".rules",
+		    strerror(errno));
+		return (-1);
+	}
+
+	rule_slots = bsde_get_rule_slots(BUFSIZ, charstr);
+	if (rule_slots == -1) {
+		len = snprintf(errstr, buflen, "unable to get rule slots: %s",
+		    strerror(errno));
+		return (-1);
+	}
+
+	name[len] = rule_slots;
+	len++;
+
+	size = sizeof(*rule);
+	error = sysctl(name, len, NULL, NULL, rule, size);
+	if (error) {
+		len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules",
+		    rule_slots, strerror(errno));
+		return (-1);
+	}
+
+	return (0);
+}

==== //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.h#5 (text+ko) ====

@@ -54,6 +54,8 @@
 int	bsde_delete_rule(int rulenum, size_t buflen, char *errstr);
 int	bsde_set_rule(int rulenum, struct mac_bsdextended_rule *rule,
 	    size_t buflen, char *errstr);
+int	bsde_add_rule(struct mac_bsdextended_rule *rule, size_t buflen,
+	    char *errstr);
 __END_DECLS
 
 #endif