Module Name: src
Committed By: christos
Date: Sun Jan 4 20:02:15 UTC 2015
Modified Files:
src/usr.sbin/npf/npfctl: npfctl.c
Log Message:
load the config file before bpfjit so that we can disable the warning.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/usr.sbin/npf/npfctl/npfctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npfctl.c
diff -u src/usr.sbin/npf/npfctl/npfctl.c:1.45 src/usr.sbin/npf/npfctl/npfctl.c:1.46
--- src/usr.sbin/npf/npfctl/npfctl.c:1.45 Fri Dec 26 17:44:54 2014
+++ src/usr.sbin/npf/npfctl/npfctl.c Sun Jan 4 15:02:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: npfctl.c,v 1.45 2014/12/26 22:44:54 christos Exp $ */
+/* $NetBSD: npfctl.c,v 1.46 2015/01/04 20:02:15 christos Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: npfctl.c,v 1.45 2014/12/26 22:44:54 christos Exp $");
+__RCSID("$NetBSD: npfctl.c,v 1.46 2015/01/04 20:02:15 christos Exp $");
#include <sys/ioctl.h>
#include <sys/stat.h>
@@ -580,9 +580,9 @@ npfctl(int action, int argc, char **argv
fun = "ioctl(IOC_NPF_SWITCH)";
break;
case NPFCTL_RELOAD:
- npfctl_preload_bpfjit();
npfctl_config_init(false);
npfctl_parse_file(argc < 3 ? NPF_CONF_PATH : argv[2]);
+ npfctl_preload_bpfjit();
errno = ret = npfctl_config_send(fd, NULL);
fun = "npfctl_config_send";
break;
