summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorotto <otto@openbsd.org>2015-11-12 09:27:09 +0000
committerotto <otto@openbsd.org>2015-11-12 09:27:09 +0000
commit66fbfadbfb48927400a06ee83dcc3d1377ae6dd2 (patch)
tree3a4f7a821d3d1512a17bda106ae10295633e4ce6
parentDefault history-file should be "" not NULL, from Greg Onufe. (diff)
downloadwireguard-openbsd-66fbfadbfb48927400a06ee83dcc3d1377ae6dd2.tar.xz
wireguard-openbsd-66fbfadbfb48927400a06ee83dcc3d1377ae6dd2.zip
an invalid carp link state is not a fatal error, since a while newly created
carp interfaces have this state for a while. ok mpi@ phessler@
-rw-r--r--usr.sbin/sasyncd/carp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/sasyncd/carp.c b/usr.sbin/sasyncd/carp.c
index a56daeda475..7a4eb11fdd8 100644
--- a/usr.sbin/sasyncd/carp.c
+++ b/usr.sbin/sasyncd/carp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: carp.c,v 1.13 2012/04/14 11:46:09 haesbaert Exp $ */
+/* $OpenBSD: carp.c,v 1.14 2015/11/12 09:27:09 otto Exp $ */
/*
* Copyright (c) 2005 Håkan Olsson. All rights reserved.
@@ -62,6 +62,7 @@ carp_map_state(u_char link_state)
state = SLAVE;
break;
case LINK_STATE_UNKNOWN:
+ case LINK_STATE_INVALID:
state = INIT;
break;
}