summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-02-24 11:50:18 +1100
committerDamien Miller <djm@mindrot.org>2003-02-24 11:50:18 +1100
commit180fc5b23682ec39964b70dc3a43f9658b7c4acb (patch)
tree2699cfbceb3faf187a104ec25565669244310001
parent0775976dc61e0c172b3b508cd13f087e477c5793 (diff)
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2003/01/27 17:06:31 [sshd.c] more specific error message when /var/empty has wrong permissions; bug #46, map@appgate.com; ok henning@, provos@, stevesk@
-rw-r--r--ChangeLog7
-rw-r--r--sshd.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 00a854fc..7f4f4e76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
dragging a window)
- Perform server grab after we have the keyboard and/or pointer to avoid
races.
+ - (djm) OpenBSD CVS Sync
+ - markus@cvs.openbsd.org 2003/01/27 17:06:31
+ [sshd.c]
+ more specific error message when /var/empty has wrong permissions;
+ bug #46, map@appgate.com; ok henning@, provos@, stevesk@
20030211
- (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com
@@ -1105,4 +1110,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2594 2003/02/24 00:48:22 djm Exp $
+$Id: ChangeLog,v 1.2595 2003/02/24 00:50:18 djm Exp $
diff --git a/sshd.c b/sshd.c
index 8a7ec6b8..ca2d4d1b 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.261 2002/11/07 16:28:47 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.262 2003/01/27 17:06:31 markus Exp $");
#include <openssl/dh.h>
#include <openssl/bn.h>
@@ -1066,8 +1066,8 @@ main(int ac, char **av)
#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);
+ fatal("%s must be owned by root and not group or "
+ "world-writable.", _PATH_PRIVSEP_CHROOT_DIR);
}
/* Configuration looks good, so exit if in test mode. */