diff options
| author | Roy Marples <roy@marples.name> | 2020-05-10 10:07:34 +0100 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2020-05-10 10:07:34 +0100 |
| commit | a865f89a17db1f9db312c4f208f301542ee3c660 (patch) | |
| tree | 3e569911d03e10d02c66316412fecbe696206186 /src | |
| parent | 727b7e9bf8b2fe810913c76c5fd36767869944bb (diff) | |
| parent | 5cbec328d79b145721cb6925721d53b5989845e1 (diff) | |
| download | dhcpcd-a865f89a17db1f9db312c4f208f301542ee3c660.tar.xz | |
Merge branch 'master' of github.com:rsmarples/dhcpcd
Diffstat (limited to 'src')
| -rw-r--r-- | src/if-options.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/if-options.c b/src/if-options.c index f2fb205b..040d7bb7 100644 --- a/src/if-options.c +++ b/src/if-options.c @@ -2095,7 +2095,7 @@ invalid_token: logerr(__func__); return -1; } - while ((i = getgrnam_r(arg, &grpbuf, p, (size_t)l, &grp)) == + while ((i = getgrnam_r(arg, &grpbuf, p, dl, &grp)) == ERANGE) { size_t nl = dl * 2; @@ -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; |