diff options
| author | sheldonh <sheldonh@FreeBSD.org> | 2000-08-10 07:54:33 +0000 |
|---|---|---|
| committer | sheldonh <sheldonh@FreeBSD.org> | 2000-08-10 07:54:33 +0000 |
| commit | 42cd26ed298eee43b237d41e84718b045e147e90 (patch) | |
| tree | d02b89f1094853ddf9533b627630919889313fea /sbin/routed/if.c | |
| parent | 937e4ba86d9feec57e270077050fe1ec9a365c2b (diff) | |
| download | FreeBSD-src-42cd26ed298eee43b237d41e84718b045e147e90.zip FreeBSD-src-42cd26ed298eee43b237d41e84718b045e147e90.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'sbin/routed/if.c')
| -rw-r--r-- | sbin/routed/if.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sbin/routed/if.c b/sbin/routed/if.c index 2e505b5..b439767 100644 --- a/sbin/routed/if.c +++ b/sbin/routed/if.c @@ -1128,6 +1128,9 @@ ifinit(void) continue; if (ifp1->int_dstaddr == RIP_DEFAULT) continue; + /* ignore aliases on the right network */ + if (!strcmp(ifp->int_name, ifp1->int_name)) + continue; if (on_net(ifp->int_dstaddr, ifp1->int_net, ifp1->int_mask) || on_net(ifp1->int_dstaddr, |
