summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2017-04-10 09:27:09 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2017-04-10 09:27:09 +0000
commit8846ad1d573e69398cbc71b0d177bdfbfdc4f3b6 (patch)
tree4792d74161f6ca370fe047f4da6a33e62306baaf
parent26fc5a626ea651d8b75b78eab223b2ec3ab90621 (diff)
Check early if the mandatory carp "interface" was configured.
This allows the new -n config check to work correctly. OK jsg@ deraadt@
-rw-r--r--usr.sbin/sasyncd/sasyncd.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/sasyncd/sasyncd.c b/usr.sbin/sasyncd/sasyncd.c
index 8e3be4f1ba9..8214457e77c 100644
--- a/usr.sbin/sasyncd/sasyncd.c
+++ b/usr.sbin/sasyncd/sasyncd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sasyncd.c,v 1.26 2017/04/04 22:37:01 jsg Exp $ */
+/* $OpenBSD: sasyncd.c,v 1.27 2017/04/10 09:27:08 reyk Exp $ */
/*
* Copyright (c) 2005 Håkan Olsson. All rights reserved.
@@ -197,6 +197,11 @@ main(int argc, char **argv)
"no shared key specified, cannot continue\n");
exit(1);
}
+ if (!cfgstate.carp_ifname || !*cfgstate.carp_ifname) {
+ fprintf(stderr, "config: "
+ "no carp interface specified, cannot continue\n");
+ exit(1);
+ }
} else {
exit(1);
}