diff options
| author | Roy Marples <roy@marples.name> | 2020-05-09 10:46:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-09 10:46:25 +0100 |
| commit | 5cbec328d79b145721cb6925721d53b5989845e1 (patch) | |
| tree | b51a44086673838a921d6cab7a5d20681ea33c21 /src | |
| parent | 2d6d4a443a670bb0b3956ed14e506827d2a4b9ee (diff) | |
| parent | 7055aabf7d1a2929f7189cf37cb44e94b62d00a4 (diff) | |
| download | dhcpcd-5cbec328d79b145721cb6925721d53b5989845e1.tar.xz | |
Merge pull request #15 from mpu/controlgroup
Do not report an error if control_group is already set
Diffstat (limited to 'src')
| -rw-r--r-- | src/if-options.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/if-options.c b/src/if-options.c index 3d9646a4..040d7bb7 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; |