summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-04-27 02:10:15 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-04-27 02:10:15 +0000
commit0f85348e899fd2243c833d078a5106de5531678e (patch)
treee2c007b03a064d79e60a83c2e1f0274e102b87d6
parent26f33893a60f712b3a6fb572cde6538bfe5ce394 (diff)
- (bal) Cygwin lacks setgroups() API. Patch by Corinna Vinschen
<vinschen@redhat.com>
-rw-r--r--ChangeLog4
-rw-r--r--uidswap.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 82f4034ce..32f57bd91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
7 Vinschen <vinschen@redhat.com> 7 Vinschen <vinschen@redhat.com>
8 - (bal) Add /etc/sysconfig/sshd support to redhat's sshd.init. Patch by 8 - (bal) Add /etc/sysconfig/sshd support to redhat's sshd.init. Patch by
9 Pekka Savola <pekkas@netcore.fi> 9 Pekka Savola <pekkas@netcore.fi>
10 - (bal) Cygwin lacks setgroups() API. Patch by Corinna Vinschen
11 <vinschen@redhat.com>
10 12
1120010425 1320010425
12 - OpenBSD CVS Sync 14 - OpenBSD CVS Sync
@@ -5262,4 +5264,4 @@
5262 - Wrote replacements for strlcpy and mkdtemp 5264 - Wrote replacements for strlcpy and mkdtemp
5263 - Released 1.0pre1 5265 - Released 1.0pre1
5264 5266
5265$Id: ChangeLog,v 1.1175 2001/04/27 00:46:17 mouring Exp $ 5267$Id: ChangeLog,v 1.1176 2001/04/27 02:10:15 mouring Exp $
diff --git a/uidswap.c b/uidswap.c
index 2c43877d6..3b264cf9e 100644
--- a/uidswap.c
+++ b/uidswap.c
@@ -80,9 +80,11 @@ temporarily_use_uid(struct passwd *pw)
80 if (user_groupslen < 0) 80 if (user_groupslen < 0)
81 fatal("getgroups: %.100s", strerror(errno)); 81 fatal("getgroups: %.100s", strerror(errno));
82 } 82 }
83#ifndef HAVE_CYGWIN
83 /* Set the effective uid to the given (unprivileged) uid. */ 84 /* Set the effective uid to the given (unprivileged) uid. */
84 if (setgroups(user_groupslen, user_groups) < 0) 85 if (setgroups(user_groupslen, user_groups) < 0)
85 fatal("setgroups: %.100s", strerror(errno)); 86 fatal("setgroups: %.100s", strerror(errno));
87#endif /* !HAVE_CYWIN */
86#ifndef SAVED_IDS_WORK_WITH_SETEUID 88#ifndef SAVED_IDS_WORK_WITH_SETEUID
87 /* Propagate the privileged gid to all of our gids. */ 89 /* Propagate the privileged gid to all of our gids. */
88 if (setgid(getegid()) < 0) 90 if (setgid(getegid()) < 0)
@@ -130,8 +132,10 @@ restore_uid(void)
130 setgid(getgid()); 132 setgid(getgid());
131#endif /* SAVED_IDS_WORK_WITH_SETEUID */ 133#endif /* SAVED_IDS_WORK_WITH_SETEUID */
132 134
135#ifndef HAVE_CYGWIN
133 if (setgroups(saved_egroupslen, saved_egroups) < 0) 136 if (setgroups(saved_egroupslen, saved_egroups) < 0)
134 fatal("setgroups: %.100s", strerror(errno)); 137 fatal("setgroups: %.100s", strerror(errno));
138#endif /* !HAVE_CYGWIN */
135 temporarily_use_uid_effective = 0; 139 temporarily_use_uid_effective = 0;
136} 140}
137 141