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/main.c | |
| parent | 5f91d2827b0e159f290b14dfc001cedaeed3ba0b (diff) | |
| download | FreeBSD-src-cb57b94ee39b660cfc6b617c2551208cf58317b5.zip FreeBSD-src-cb57b94ee39b660cfc6b617c2551208cf58317b5.tar.gz | |
Resolve conflicts from vendor merge.
Diffstat (limited to 'sbin/routed/main.c')
| -rw-r--r-- | sbin/routed/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sbin/routed/main.c b/sbin/routed/main.c index cf4edba..5c52455 100644 --- a/sbin/routed/main.c +++ b/sbin/routed/main.c @@ -82,7 +82,9 @@ time_t now_expire; time_t now_garbage; struct timeval next_bcast; /* next general broadcast */ -struct timeval no_flash = {EPOCH+SUPPLY_INTERVAL}; /* inhibit flash update */ +struct timeval no_flash = { /* inhibit flash update */ + EPOCH+SUPPLY_INTERVAL, 0 +}; struct timeval flush_kern_timer; @@ -221,7 +223,7 @@ main(int argc, case 'v': /* display version */ verbose++; - msglog("version 2.17"); + msglog("version 2.21"); break; default: |
