diff options
| author |   renato <renato@openbsd.org> | 2016-05-23 16:41:52 +0000 |
|---|---|---|
| committer | renato <renato@openbsd.org> | 2016-05-23 16:41:52 +0000 |
| commit | 912987a0e829a1ea97a076d7de074d61d645c6ea (patch) | |
| tree | 572a34378134d5afe4434e06e4ea99ce770d1901 /usr.sbin/ldpd/labelmapping.c | |
| parent | clear_config() should only deallocate memory and nothing else. (diff) | |
| download | wireguard-openbsd-912987a0e829a1ea97a076d7de074d61d645c6ea.tar.xz wireguard-openbsd-912987a0e829a1ea97a076d7de074d61d645c6ea.zip | |
Fix check of when a wildcard group PW-ID FEC is valid or not.
In addition to label mappings, wildcard group PW-ID FECs are invalid in
label requests and label abort requests too.
Diffstat (limited to 'usr.sbin/ldpd/labelmapping.c')
| -rw-r--r-- | usr.sbin/ldpd/labelmapping.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/ldpd/labelmapping.c b/usr.sbin/ldpd/labelmapping.c index 891f566e2ab..3f47ccd35f7 100644 --- a/usr.sbin/ldpd/labelmapping.c +++ b/usr.sbin/ldpd/labelmapping.c @@ -1,4 +1,4 @@ -/* $OpenBSD: labelmapping.c,v 1.38 2016/05/23 16:25:11 renato Exp $ */ +/* $OpenBSD: labelmapping.c,v 1.39 2016/05/23 16:41:52 renato Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -181,8 +181,9 @@ recv_labelmessage(struct nbr *nbr, char *buf, u_int16_t len, u_int16_t type) &map)) == -1) goto err; if (map.type == MAP_TYPE_PWID && - type == MSG_TYPE_LABELMAPPING && - !(map.flags & F_MAP_PW_ID)) { + !(map.flags & F_MAP_PW_ID) && + type != MSG_TYPE_LABELWITHDRAW && + type != MSG_TYPE_LABELRELEASE) { send_notification_nbr(nbr, S_MISS_MSG, lm.msgid, lm.type); return (-1); |