Page MenuHomeFreeBSD
Files F163551628

D54799.diff
No OneTemporary
Actions

D54799.diff
View Options

diff --git a/usr.sbin/syslogd/tests/syslogd_test.sh b/usr.sbin/syslogd/tests/syslogd_test.sh
--- a/usr.sbin/syslogd/tests/syslogd_test.sh
+++ b/usr.sbin/syslogd/tests/syslogd_test.sh
@@ -380,10 +380,8 @@
atf_check ifconfig ${epair}a vnet syslogd_allowed_peer
atf_check ifconfig ${epair}b vnet syslogd_client
atf_check jexec syslogd_allowed_peer ifconfig ${epair}a inet 169.254.0.1/16
- atf_check jexec syslogd_allowed_peer ifconfig lo0 inet 127.0.0.1/8
atf_check jexec syslogd_client ifconfig ${epair}b inet 169.254.0.2/16
atf_check jexec syslogd_client ifconfig ${epair}b alias 169.254.0.3/16
- atf_check jexec syslogd_client ifconfig lo0 inet 127.0.0.1/8
}
allowed_peer_test_cleanup()
@@ -529,12 +527,10 @@
atf_check ifconfig ${epair}a vnet syslogd_server
atf_check jexec syslogd_server ifconfig ${epair}a inet 169.254.0.1/16
atf_check jexec syslogd_server ifconfig ${epair}a alias 169.254.0.2/16
- atf_check jexec syslogd_server ifconfig lo0 inet 127.0.0.1/8
syslogd_mkjail syslogd_client vnet
atf_check ifconfig ${epair}b vnet syslogd_client
atf_check jexec syslogd_client ifconfig ${epair}b inet 169.254.0.3/16
- atf_check jexec syslogd_client ifconfig lo0 inet 127.0.0.1/8
cat <<__EOF__ > ./client_config
user.debug @169.254.0.1
diff --git a/usr.sbin/syslogd/tests/syslogd_test_common.sh b/usr.sbin/syslogd/tests/syslogd_test_common.sh
--- a/usr.sbin/syslogd/tests/syslogd_test_common.sh
+++ b/usr.sbin/syslogd/tests/syslogd_test_common.sh
@@ -23,9 +23,6 @@
local jail bind_arg conf_file pid_file socket privsocket
local opt next other_args
- # Setup loopback so we can deliver messages to ourself.
- atf_check ifconfig lo0 inet 127.0.0.1/16
-
OPTIND=1
while getopts ":b:f:j:P:p:S:" opt; do
case "${opt}" in
@@ -71,6 +68,11 @@
esac
done
+ # Setup loopback so we can deliver messages to ourself.
+ if [ $($jail sysctl -n security.jail.vnet) -ne 0 ]; then
+ atf_check $jail ifconfig lo0 inet 127.0.0.1/8
+ fi
+
$jail syslogd \
${bind_arg:--b :${SYSLOGD_UDP_PORT}} \
-C \

File Metadata

Mime Type
text/plain
Expires
Sat, Jul 25, 9:49 AM (18 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35470575
Default Alt Text
D54799.diff (2 KB)

Event Timeline