diff options
| author | Philipp Buehler <pb@cvs.openbsd.org> | 2003-03-04 11:23:44 +0000 |
|---|---|---|
| committer | Philipp Buehler <pb@cvs.openbsd.org> | 2003-03-04 11:23:44 +0000 |
| commit | 16a9e95aabf3f927c9d8727fb5a668bb3b78f743 (patch) | |
| tree | fe11d57aeec8d5b8a592ce3d3f6e655fc08845c7 /sys | |
| parent | 89dcdfb45736b092c658d09ef1f79f95aa17d432 (diff) | |
(really) support user/group rules with 'inet6'
pointed out by hugh
ok dhartmei@, henning@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/pf.c | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index 9bf3b337dbb..8367f7aabcd 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.325 2003/03/02 12:00:39 dhartmei Exp $ */ +/* $OpenBSD: pf.c,v 1.326 2003/03/04 11:23:43 pb Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1802,8 +1802,6 @@ pf_socket_lookup(uid_t *uid, gid_t *gid, int direction, sa_family_t af, *uid = UID_MAX; *gid = GID_MAX; - if (af != AF_INET) - return (0); switch (proto) { case IPPROTO_TCP: sport = pd->hdr.tcp->th_sport; @@ -1830,12 +1828,31 @@ pf_socket_lookup(uid_t *uid, gid_t *gid, int direction, sa_family_t af, saddr = pd->dst; daddr = pd->src; } - inp = in_pcbhashlookup(tb, saddr->v4, sport, daddr->v4, dport); - if (inp == NULL) { - inp = in_pcblookup(tb, &saddr->v4, sport, &daddr->v4, dport, - INPLOOKUP_WILDCARD); - if (inp == NULL) - return (0); + switch(af) { + case AF_INET: + inp = in_pcbhashlookup(tb, saddr->v4, sport, daddr->v4, dport); + if (inp == NULL) { + inp = in_pcblookup(tb, &saddr->v4, sport, &daddr->v4, + dport, INPLOOKUP_WILDCARD); + if (inp == NULL) + return (0); + } + break; +#ifdef INET6 + case AF_INET6: + inp = in6_pcbhashlookup(tb, &saddr->v6, sport, &daddr->v6, + dport); + if (inp == NULL) { + inp = in_pcblookup(tb, &saddr->v6, sport, &daddr->v6, + dport, INPLOOKUP_WILDCARD | INPLOOKUP_IPV6); + if (inp == NULL) + return (0); + } + break; +#endif /* INET6 */ + + default: + return (0); } *uid = inp->inp_socket->so_euid; *gid = inp->inp_socket->so_egid; |