X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fidpriv-droptemp.c;h=13d1064e896ff8fcf3942a9e5684c31c1040ce5d;hb=fa1db0dd22768f09a507674a30beb5b8a87bb35f;hp=a7f26660a2d9938f4042ef1728848d8c84158366;hpb=10a856eb3aa7ffe196fa20c9901d356f2109c40f;p=gnulib.git diff --git a/lib/idpriv-droptemp.c b/lib/idpriv-droptemp.c index a7f26660a..13d1064e8 100644 --- a/lib/idpriv-droptemp.c +++ b/lib/idpriv-droptemp.c @@ -1,5 +1,5 @@ /* Dropping uid/gid privileges of the current process temporarily. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -51,7 +51,7 @@ idpriv_temp_drop (void) # if HAVE_SETRESGID /* glibc, FreeBSD, OpenBSD, HP-UX */ if (setresgid (-1, gid, saved_gid) < 0) return -1; -# else /* MacOS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */ +# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */ if (setregid (-1, gid) < 0) return -1; # endif @@ -62,7 +62,7 @@ idpriv_temp_drop (void) figure 14. */ if (setresuid (-1, uid, saved_uid) < 0) return -1; -# else /* MacOS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */ +# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */ if (setreuid (-1, uid) < 0) return -1; # endif @@ -78,9 +78,9 @@ idpriv_temp_drop (void) uid_t effective; uid_t saved; if (getresuid (&real, &effective, &saved) < 0 - || real != uid - || effective != uid - || saved != saved_uid) + || real != uid + || effective != uid + || saved != saved_uid) abort (); } # else @@ -97,9 +97,9 @@ idpriv_temp_drop (void) uid_t effective; uid_t saved; if (getresgid (&real, &effective, &saved) < 0 - || real != gid - || effective != gid - || saved != saved_gid) + || real != gid + || effective != gid + || saved != saved_gid) abort (); } # else @@ -138,7 +138,7 @@ idpriv_temp_restore (void) figure 14. */ if (setresuid (-1, saved_uid, -1) < 0) return -1; -# else /* MacOS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */ +# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */ if (setreuid (-1, saved_uid) < 0) return -1; # endif @@ -147,7 +147,7 @@ idpriv_temp_restore (void) # if HAVE_SETRESGID /* glibc, FreeBSD, OpenBSD, HP-UX */ if (setresgid (-1, saved_gid, -1) < 0) return -1; -# else /* MacOS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */ +# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */ if (setregid (-1, saved_gid) < 0) return -1; # endif @@ -163,9 +163,9 @@ idpriv_temp_restore (void) uid_t effective; uid_t saved; if (getresuid (&real, &effective, &saved) < 0 - || real != uid - || effective != saved_uid - || saved != saved_uid) + || real != uid + || effective != saved_uid + || saved != saved_uid) abort (); } # else @@ -182,9 +182,9 @@ idpriv_temp_restore (void) uid_t effective; uid_t saved; if (getresgid (&real, &effective, &saved) < 0 - || real != gid - || effective != saved_gid - || saved != saved_gid) + || real != gid + || effective != saved_gid + || saved != saved_gid) abort (); } # else