diff options
| author | Sheldon Hearn <sheldonh@FreeBSD.org> | 2000-08-10 07:54:33 +0000 |
|---|---|---|
| committer | Sheldon Hearn <sheldonh@FreeBSD.org> | 2000-08-10 07:54:33 +0000 |
| commit | 601786588599b2a2f605f8e15f500a7ac8c2048c (patch) | |
| tree | 1904ec13349b712b62f50c3b41682401b72ddd89 /sbin/routed/if.c | |
| parent | 4466a3504db94af563a4dd1ebde1c67e9d41a760 (diff) | |
| parent | 8b336df137952a0496f5e8d30747d009c939724e (diff) | |
| download | src-601786588599b2a2f605f8e15f500a7ac8c2048c.tar.gz src-601786588599b2a2f605f8e15f500a7ac8c2048c.zip | |
Resolve conflicts.
Notes
Notes:
svn path=/head/; revision=64483
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 2e505b5005cd..b439767cc506 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, |