Skip to content

Commit 1f2748a

Browse files
committed
Auto merge of rust-lang#760 - JayH5:linux-initgroups, r=alexcrichton
Linux/Android: re-add initgroups This was removed in rust-lang#742
2 parents 95848f9 + 6da0389 commit 1f2748a

File tree

3 files changed

+2
-1
lines changed

3 files changed

+2
-1
lines changed

Diff for: src/unix/notbsd/android/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1065,6 +1065,7 @@ extern {
10651065
group: ::gid_t,
10661066
groups: *mut ::gid_t,
10671067
ngroups: *mut ::c_int) -> ::c_int;
1068+
pub fn initgroups(user: *const ::c_char, group: ::gid_t) -> ::c_int;
10681069
pub fn pthread_mutexattr_getpshared(attr: *const pthread_mutexattr_t,
10691070
pshared: *mut ::c_int) -> ::c_int;
10701071
#[cfg_attr(all(target_os = "macos", target_arch = "x86"),

Diff for: src/unix/notbsd/linux/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1322,6 +1322,7 @@ extern {
13221322
buf: *mut ::c_char,
13231323
buflen: ::size_t,
13241324
result: *mut *mut ::group) -> ::c_int;
1325+
pub fn initgroups(user: *const ::c_char, group: ::gid_t) -> ::c_int;
13251326
#[cfg_attr(all(target_os = "macos", target_arch = "x86"),
13261327
link_name = "pthread_sigmask$UNIX2003")]
13271328
pub fn pthread_sigmask(how: ::c_int, set: *const sigset_t,

Diff for: src/unix/notbsd/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -997,4 +997,3 @@ cfg_if! {
997997
// name: *mut ::c_char,
998998
// termp: *const termios,
999999
// winp: *const ::winsize) -> ::pid_t;
1000-
// pub fn initgroups(user: *const ::c_char, group: ::gid_t) -> ::c_int;

0 commit comments

Comments
 (0)