diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-02-22 17:57:13 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-02-22 17:57:13 +1100 |
commit | 2ea9b18918162bd17758f1480247c9fa4e75e418 (patch) | |
tree | 7666f5b5f0751f359005c5cdda6a0f14438fdae4 | |
parent | 04cfbe04aaa0ff43c3e8f131c858411e1b0151a2 (diff) |
- (dtucker) [uidswap.c] Skip uid restore test on Cygwin. Patch from
vinschen at redhat.com.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | uidswap.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20050222 | ||
2 | - (dtucker) [uidswap.c] Skip uid restore test on Cygwin. Patch from | ||
3 | vinschen at redhat.com. | ||
4 | |||
1 | 20050220 | 5 | 20050220 |
2 | - (dtucker) [LICENCE Makefile.in README.platform audit-bsm.c configure.ac | 6 | - (dtucker) [LICENCE Makefile.in README.platform audit-bsm.c configure.ac |
3 | defines.h] Bug #125: Add *EXPERIMENTAL* BSM audit support. Configure | 7 | defines.h] Bug #125: Add *EXPERIMENTAL* BSM audit support. Configure |
@@ -2156,4 +2160,4 @@ | |||
2156 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2160 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2157 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2161 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2158 | 2162 | ||
2159 | $Id: ChangeLog,v 1.3661 2005/02/20 12:27:11 dtucker Exp $ | 2163 | $Id: ChangeLog,v 1.3662 2005/02/22 06:57:13 dtucker Exp $ |
@@ -56,10 +56,12 @@ temporarily_use_uid(struct passwd *pw) | |||
56 | debug("temporarily_use_uid: %u/%u (e=%u/%u)", | 56 | debug("temporarily_use_uid: %u/%u (e=%u/%u)", |
57 | (u_int)pw->pw_uid, (u_int)pw->pw_gid, | 57 | (u_int)pw->pw_uid, (u_int)pw->pw_gid, |
58 | (u_int)saved_euid, (u_int)saved_egid); | 58 | (u_int)saved_euid, (u_int)saved_egid); |
59 | #ifndef HAVE_CYGWIN | ||
59 | if (saved_euid != 0) { | 60 | if (saved_euid != 0) { |
60 | privileged = 0; | 61 | privileged = 0; |
61 | return; | 62 | return; |
62 | } | 63 | } |
64 | #endif | ||
63 | #else | 65 | #else |
64 | if (geteuid() != 0) { | 66 | if (geteuid() != 0) { |
65 | privileged = 0; | 67 | privileged = 0; |