diff options
| author | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2006-05-29 15:59:50 +0000 |
|---|---|---|
| committer | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2006-05-29 15:59:50 +0000 |
| commit | 9c74a8c3769fb18a2c2bfac82d74eb14a412933e (patch) | |
| tree | 00d8ab69a5000c5218de87d48023949bb9065f26 /sbin/ipsecctl/parse.y | |
| parent | 04f5868d39125a3aa3c03fceba36def051b0cd2c (diff) | |
Also return proper list of addresses for interface groups.
As usual, this and the previous commit reused suitable code from
the tree (pfctl).
Diffstat (limited to 'sbin/ipsecctl/parse.y')
| -rw-r--r-- | sbin/ipsecctl/parse.y | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/sbin/ipsecctl/parse.y b/sbin/ipsecctl/parse.y index db747578876..3c43ba42bc1 100644 --- a/sbin/ipsecctl/parse.y +++ b/sbin/ipsecctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.76 2006/05/29 15:48:46 hshoexer Exp $ */ +/* $OpenBSD: parse.y,v 1.77 2006/05/29 15:59:49 hshoexer Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -1393,7 +1393,7 @@ ifa_grouplookup(const char *ifa_name) struct ifgroupreq ifgr; int s; size_t len; - struct ipsec_addr_wrap *ipa = NULL; + struct ipsec_addr_wrap *n, *h = NULL, *hn; if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) err(1, "socket"); @@ -1413,13 +1413,21 @@ ifa_grouplookup(const char *ifa_name) for (ifg = ifgr.ifgr_groups; ifg && len >= sizeof(struct ifg_req); ifg++) { len -= sizeof(struct ifg_req); - if ((ipa = ifa_lookup(ifg->ifgrq_member)) != NULL) - break; + if ((n = ifa_lookup(ifg->ifgrq_member)) == NULL) + continue; + if (h == NULL) + h = n; + else { + for (hn = h; hn->next != NULL; hn = hn->next) + ; /* nothing */ + hn->next = n; + n->tail = hn; + } } free(ifgr.ifgr_groups); close(s); - return (ipa); + return (h); } struct ipsec_addr_wrap * |