Auto merge of #760 - JayH5:linux-initgroups, r=alexcrichton

Linux/Android: re-add initgroups This was removed in #742
rust-lang · Sep 9, 2017 · 1f2748a · 1f2748a
2 parents 95848f9 + 6da0389
commit 1f2748a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/src/unix/notbsd/android/mod.rs b/src/unix/notbsd/android/mod.rs
@@ -1065,6 +1065,7 @@ extern {
                         group: ::gid_t,
                         groups: *mut ::gid_t,
                         ngroups: *mut ::c_int) -> ::c_int;
+    pub fn initgroups(user: *const ::c_char, group: ::gid_t) -> ::c_int;
     pub fn pthread_mutexattr_getpshared(attr: *const pthread_mutexattr_t,
                                         pshared: *mut ::c_int) -> ::c_int;
     #[cfg_attr(all(target_os = "macos", target_arch = "x86"),

diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs
@@ -1322,6 +1322,7 @@ extern {
                       buf: *mut ::c_char,
                       buflen: ::size_t,
                       result: *mut *mut ::group) -> ::c_int;
+    pub fn initgroups(user: *const ::c_char, group: ::gid_t) -> ::c_int;
     #[cfg_attr(all(target_os = "macos", target_arch = "x86"),
                link_name = "pthread_sigmask$UNIX2003")]
     pub fn pthread_sigmask(how: ::c_int, set: *const sigset_t,

diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs
@@ -997,4 +997,3 @@ cfg_if! {
     //             name: *mut ::c_char,
     //             termp: *const termios,
     //             winp: *const ::winsize) -> ::pid_t;
-    // pub fn initgroups(user: *const ::c_char, group: ::gid_t) -> ::c_int;