Mercurial > hg > dhcpcd

changeset 5199:dfbd1f961093 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #15 from mpu/controlgroup Do not report an error if control_group is already set
author Roy Marples <roy@marples.name>
date Sat, 09 May 2020 10:46:25 +0100
parents b58248b5703a (current diff) 12b6ba947111 (diff)
children 84674dd6a288
files src/if-options.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/if-options.c	Fri May 08 11:37:50 2020 +0100
+++ b/src/if-options.c	Sat May 09 10:46:25 2020 +0100
@@ -2120,7 +2120,8 @@
 			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 @@
 #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;