X-Git-Url: https://ruderich.org/simon/gitweb/?p=ptyas%2Fptyas.git;a=blobdiff_plain;f=ptyas.c;h=e8e1ba7de1eb9f7a296d14683b061ba306b7d771;hp=dc5f3de85e5ba2646652d2440c1504f8c5a956a4;hb=2bd62914a0887c368ddba71f0fbcd0a01084b4b6;hpb=a340b52624733c23fe40d61d181916e4bd778945 diff --git a/ptyas.c b/ptyas.c index dc5f3de..e8e1ba7 100644 --- a/ptyas.c +++ b/ptyas.c @@ -117,12 +117,29 @@ static int snprintf_or_assert(char *str, size_t size, const char *format, ...) { static void drop_privileges_or_die(uid_t uid, gid_t gid) { /* Drop all supplementary group IDs. */ +#ifdef __FreeBSD__ + { + /* FreeBSD uses the first gid to set the egid of the process. */ + gid_t egid = gid; + if (setgroups(1, &egid) != 0) { + die("setgroups"); + } + if (getgroups(1, &egid) != 1) { + die_fmt("failed to drop all supplementary groups\n"); + } + if (egid != gid) { + die_fmt("failed to drop all supplementary groups (egid): %d %d\n", + egid, gid); + } + } +#else if (setgroups(0, NULL) != 0) { die("setgroups"); } if (getgroups(0, NULL) != 0) { die_fmt("failed to drop all supplementary groups\n"); } +#endif /* Dropping groups may require privileges, do that first. */ if (setresgid(gid, gid, gid) != 0) {