From owner-p4-projects@FreeBSD.ORG  Mon Mar  3 17:53:14 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 78E931065673; Mon,  3 Mar 2008 17:53:14 +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 3884A1065671
	for <perforce@freebsd.org>; Mon,  3 Mar 2008 17:53:14 +0000 (UTC)
	(envelope-from alm@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 387CE8FC25
	for <perforce@freebsd.org>; Mon,  3 Mar 2008 17:53:14 +0000 (UTC)
	(envelope-from alm@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 m23HrET6069492
	for <perforce@freebsd.org>; Mon, 3 Mar 2008 17:53:14 GMT
	(envelope-from alm@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m23HrEY5069490
	for perforce@freebsd.org; Mon, 3 Mar 2008 17:53:14 GMT
	(envelope-from alm@freebsd.org)
Date: Mon, 3 Mar 2008 17:53:14 GMT
Message-Id: <200803031753.m23HrEY5069490@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	alm@freebsd.org using -f
From: Aaron Meihm <alm@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 136756 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 03 Mar 2008 17:53:15 -0000

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

Change 136756 by alm@alm_praetorian on 2008/03/03 17:52:28

	Adjust configuration parser for crypto commands.

Affected files ...

.. //depot/projects/trustedbsd/netauditd/conf.c#5 edit
.. //depot/projects/trustedbsd/netauditd/netauditd.h#9 edit

Differences ...

==== //depot/projects/trustedbsd/netauditd/conf.c#5 (text+ko) ====

@@ -51,19 +51,27 @@
 				exit(1); }
 
 static const struct conf_ent {
-	char		*c_mode;
-	char		*c_type;
+	char		*c_cmd;
+	char		*c_arg1;
+	char		*c_arg2;
 	int		c_min_args;
 	int		(*c_func)(args_t *);
 } conftab[] = {
-	{ "src", "pipe", 4, conf_parse_src_pipe },
-	{ "src", "net", 5, conf_parse_net },
-	{ "dst", "trail", 5, conf_parse_dst_trail },
-	{ "dst", "net", 6, conf_parse_net },
-	{ NULL, NULL, 0, NULL }
+	{ "src", NULL, "pipe", 4, conf_parse_src_pipe },
+	{ "src", NULL, "net", 5, conf_parse_net },
+	{ "dst", NULL, "trail", 5, conf_parse_dst_trail },
+	{ "dst", NULL, "net", 6, conf_parse_net },
+	{ "crypto", "keyfile", NULL, 3, conf_parse_keyfile },
+	{ NULL, NULL, NULL, 0, NULL }
 };
 
 int
+conf_parse_keyfile(args_t *a)
+{
+	return (0);
+}
+
+int
 conf_parse_net(args_t *a)
 {
 	struct addrinfo hints;
@@ -210,9 +218,12 @@
 	/* The minimum number of arguments for a command is 3. */
 	if (a->args_n < 3)
 		SYNTAX_ERROR(conf_path, lc)
-	for (cptr = conftab; cptr->c_type != NULL; cptr++) {
-		if ((strcmp(cptr->c_mode, a->args[0]) == 0) &&
-		    (strcmp(cptr->c_type, a->args[2]) == 0)) {
+	for (cptr = conftab; cptr->c_cmd != NULL; cptr++) {
+		if ((strcmp(cptr->c_cmd, a->args[0]) == 0) &&
+		    (cptr->c_arg1 ? (strcmp(cptr->c_arg1, a->args[1]) == 0)
+		    : 1) &&
+		    (cptr->c_arg2 ? (strcmp(cptr->c_arg2, a->args[2]) == 0)
+		    : 1)) {
 			if (a->args_n < cptr->c_min_args)
 				SYNTAX_ERROR(conf_path, lc)
 			if (cptr->c_func(a) == -1)
@@ -220,7 +231,7 @@
 			break;
 		}
 	}
-	if (cptr->c_type == NULL)
+	if (cptr->c_cmd == NULL)
 		SYNTAX_ERROR(conf_path, lc)
 	conf_free_args(a);
 }

==== //depot/projects/trustedbsd/netauditd/netauditd.h#9 (text+ko) ====

@@ -90,6 +90,7 @@
 void		conf_load(char *);
 int		conf_link_consumers(struct au_cmpnt *, args_t *, int);
 void		conf_parse(char *, int);
+int		conf_parse_keyfile(args_t *);
 int		conf_parse_src_pipe(args_t *);
 int		conf_parse_dst_trail(args_t *);
 int		conf_parse_net(args_t *);