summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-27 18:02:21 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-27 18:02:21 +0000
commit596273516c67cfded71acee848de6db4daa41a1a (patch)
tree0af208ac60edc413019c6e0b3bd168f6d249a720
parentbdf3e89f1a6d9697c627660cb5ae9828c89ce8f7 (diff)
- (bal) Cygwin uid0 fix by vinschen@redhat.com
-rw-r--r--ChangeLog3
-rw-r--r--sshd.c7
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 273b2abf..eeaf7c7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
20020628
- (stevesk) [sshd_config] PAMAuthenticationViaKbdInt no; commented
options should contain default value. from solar.
+ - (bal) Cygwin uid0 fix by vinschen@redhat.com
200206027
- OpenBSD CVS Sync
@@ -1191,4 +1192,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2308 2002/06/27 16:59:50 stevesk Exp $
+$Id: ChangeLog,v 1.2309 2002/06/27 18:02:21 mouring Exp $
diff --git a/sshd.c b/sshd.c
index 851fad4b..d2524c4b 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1035,7 +1035,14 @@ main(int ac, char **av)
(S_ISDIR(st.st_mode) == 0))
fatal("Missing privilege separation directory: %s",
_PATH_PRIVSEP_CHROOT_DIR);
+
+#ifdef HAVE_CYGWIN
+ if (check_ntsec(_PATH_PRIVSEP_CHROOT_DIR) &&
+ (st.st_uid != getuid () ||
+ (st.st_mode & (S_IWGRP|S_IWOTH)) != 0))
+#else
if (st.st_uid != 0 || (st.st_mode & (S_IWGRP|S_IWOTH)) != 0)
+#endif
fatal("Bad owner or mode for %s",
_PATH_PRIVSEP_CHROOT_DIR);
}