From 6ce7bd46e70c1b1f4ccc9c61f75694726d9334be Mon Sep 17 00:00:00 2001 From: reyk Date: Mon, 10 Apr 2017 09:27:08 +0000 Subject: [PATCH] Check early if the mandatory carp "interface" was configured. This allows the new -n config check to work correctly. OK jsg@ deraadt@ --- usr.sbin/sasyncd/sasyncd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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); } -- 2.20.1