Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid null pointer deref. sync with kame.

Browse Source
This commit is contained in:
itojun 2001-04-25 11:25:51 +00:00
parent 1b0bc07d26
commit 4db33fdf62
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/faithd/faithd.8
View File

@ -1,5 +1,5 @@
.\" $NetBSD: faithd.8,v 1.13 2001/02/15 17:58:55 itojun Exp $
.\" $KAME: faithd.8,v 1.26 2001/02/15 17:55:54 itojun Exp $
.\" $NetBSD: faithd.8,v 1.14 2001/04/25 11:25:51 itojun Exp $
.\" $KAME: faithd.8,v 1.27 2001/02/19 11:17:58 itojun Exp $
.\"
.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
.\" All rights reserved.
@ -384,7 +384,7 @@ on error.
.%A Kazu Yamamoto
.%T "An IPv6-to-IPv4 transport relay translator"
.%R internet draft
.%N draft-ietf-ngtrans-tcpudp-relay-01.txt
.%N draft-ietf-ngtrans-tcpudp-relay-04.txt
.%O work in progress material
.Re
.\"

15
usr.sbin/faithd/faithd.c
View File

@ -1,5 +1,5 @@
/* $NetBSD: faithd.c,v 1.18 2001/03/20 01:13:46 itojun Exp $ */
/* $KAME: faithd.c,v 1.38 2001/02/27 06:46:52 itojun Exp $ */
/* $NetBSD: faithd.c,v 1.19 2001/04/25 11:25:51 itojun Exp $ */
/* $KAME: faithd.c,v 1.39 2001/04/25 11:20:42 itojun Exp $ */
/*
* Copyright (C) 1997 and 1998 WIDE Project.
@ -546,9 +546,14 @@ play_child(int s_src, struct sockaddr *srcaddr)
conf = config_match(srcaddr, sa4);
if (!conf || !conf->permit) {
close(s_src);
exit_failure("translation to %s not permitted for %s", dst4,
prefix_string(&conf->match));
/*NOTREACHED*/
if (conf) {
exit_failure("translation to %s not permitted for %s",
dst4, prefix_string(&conf->match));
/*NOTREACHED*/
} else {
exit_failure("translation to %s not permitted", dst4);
/*NOTREACHED*/
}
}
syslog(LOG_INFO, "the translator is connecting to %s", dst4);