Merge pull request #3453 from panlinux/validate-group-before-using-1462

Validate group before using it
This commit is contained in:
Luca Boccassi 2019-03-18 23:29:06 +00:00 committed by GitHub
commit 168aa83d08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 2 deletions

17
RELICENSE/panlinux.md Normal file
View File

@ -0,0 +1,17 @@
# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
This is a statement by Andreas Hasenack that grants permission to
relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
approved license chosen by the current ZeroMQ BDFL (Benevolent
Dictator for Life).
A portion of the commits made by the Github handle "panlinux", with
commit author "Andreas Hasenack <andreas@canonical.com>", are
copyright of Andreas Hasenack. This document hereby grants the libzmq
project team to relicense libzmq, including all past, present and
future contributions of the author listed above.
Andreas Hasenack
2019/03/18

View File

@ -122,8 +122,10 @@ void init_groups ()
supgroup = group;
notgroup = group + 1;
for (int i = 0; i < ngroups; i++) {
if (supgroup == group && group != groups[i])
supgroup = groups[i];
if (supgroup == group && group != groups[i]) {
if (getgrgid (groups[i]))
supgroup = groups[i];
}
if (notgroup <= groups[i])
notgroup = groups[i] + 1;
}

View File

@ -78,8 +78,10 @@
#include <unistd.h>
#include <signal.h>
#include <stdlib.h>
#include <grp.h>
#include <sys/wait.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <net/if.h>