diff options
| author | sheldonh <sheldonh@FreeBSD.org> | 2000-08-02 11:38:20 +0000 |
|---|---|---|
| committer | sheldonh <sheldonh@FreeBSD.org> | 2000-08-02 11:38:20 +0000 |
| commit | cb57b94ee39b660cfc6b617c2551208cf58317b5 (patch) | |
| tree | fb36327bc743d30e739b5789da2091cd8d482bb4 /sbin/routed/parms.c | |
| parent | 5f91d2827b0e159f290b14dfc001cedaeed3ba0b (diff) | |
| download | FreeBSD-src-cb57b94ee39b660cfc6b617c2551208cf58317b5.zip FreeBSD-src-cb57b94ee39b660cfc6b617c2551208cf58317b5.tar.gz | |
Resolve conflicts from vendor merge.
Diffstat (limited to 'sbin/routed/parms.c')
| -rw-r--r-- | sbin/routed/parms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c index abea5f6..057dae9 100644 --- a/sbin/routed/parms.c +++ b/sbin/routed/parms.c @@ -757,7 +757,7 @@ parse_parms(char *line, } else if (PARS("passive")) { CKF((GROUP_IS_SOL_OUT|GROUP_IS_ADV_OUT), IS_NO_RDISC); - parm.parm_int_state |= IS_NO_RIP; + parm.parm_int_state |= IS_NO_RIP| IS_PASSIVE; } else if (PARSEQ("rdisc_pref")) { if (parm.parm_rdisc_pref != 0 |
