From: Quentin Carbonneaux <quentin@c9x.me>
Date: Tue, 5 May 2020 15:43:04 +0000 (+0200)
Subject: Do not report an error if control_group is already set
X-Git-Tag: v9.1.0~85^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8af4b65237070abacce7552c7d99f6e425dc1bd9;p=thirdparty%2Fdhcpcd.git

Do not report an error if control_group is already set
---

diff --git a/src/if-options.c b/src/if-options.c
index f2fb205b..aa213563 100644
--- a/src/if-options.c
+++ b/src/if-options.c
@@ -2120,7 +2120,8 @@ invalid_token:
 			return -1;
 		}
 		if (grp == NULL) {
-			logerrx("controlgroup: %s: not found", arg);
+			if (!ctx->control_group)
+				logerrx("controlgroup: %s: not found", arg);
 			free(p);
 			return -1;
 		}
@@ -2129,7 +2130,8 @@ invalid_token:
 #else
 		grp = getgrnam(arg);
 		if (grp == NULL) {
-			logerrx("controlgroup: %s: not found", arg);
+			if (!ctx->control_group)
+				logerrx("controlgroup: %s: not found", arg);
 			return -1;
 		}
 		ctx->control_group = grp->gr_gid;