diff options
| author | Guido van Rooij <guido@FreeBSD.org> | 2005-12-30 11:32:23 +0000 |
|---|---|---|
| committer | Guido van Rooij <guido@FreeBSD.org> | 2005-12-30 11:32:23 +0000 |
| commit | 9088f4e67b87cf0d6e1b74723daa4206fd49dc35 (patch) | |
| tree | 9d9609ac6630c945d00f5af3ce25a44c0a031d15 /sys/contrib/ipfilter/netinet/ip_htable.c | |
| parent | 6afb2250fbb0338d050b74e265d0f7dfbb90d52f (diff) | |
| download | src-9088f4e67b87cf0d6e1b74723daa4206fd49dc35.tar.gz src-9088f4e67b87cf0d6e1b74723daa4206fd49dc35.zip | |
Resolve conflicts
Notes
Notes:
svn path=/head/; revision=153876
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ip_htable.c')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_htable.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_htable.c b/sys/contrib/ipfilter/netinet/ip_htable.c index d1769b75607b..aaecaa63f52d 100644 --- a/sys/contrib/ipfilter/netinet/ip_htable.c +++ b/sys/contrib/ipfilter/netinet/ip_htable.c @@ -53,7 +53,7 @@ struct file; /* END OF INCLUDES */ #if !defined(lint) -static const char rcsid[] = "@(#)Id: ip_htable.c,v 2.34.2.2 2004/10/17 15:49:15 darrenr Exp"; +static const char rcsid[] = "@(#)$Id: ip_htable.c,v 2.34.2.4 2005/11/13 15:38:37 darrenr Exp $"; #endif #ifdef IPFILTER_LOOKUP @@ -141,12 +141,9 @@ iplookupop_t *op; sizeof(oiph->iph_name)) == 0) break; } while (oiph != NULL); + (void)strncpy(iph->iph_name, name, sizeof(iph->iph_name)); - err = COPYOUT(iph, op->iplo_struct, sizeof(*iph)); - if (err != 0) { - KFREE(iph); - return EFAULT; - } + (void)strncpy(op->iplo_name, name, sizeof(op->iplo_name)); iph->iph_type |= IPHASH_ANON; } |