diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2002-05-15 21:02:54 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2002-05-15 21:02:54 +0000 |
| commit | 1083da78def0479250cb71c9ed9954646794b09c (patch) | |
| tree | 4eacc6cfee5b14b0939f9ebb06799f67df6f7815 /usr.bin/ssh | |
| parent | 01d0c41fec21590c57f71273972dc317fe0cc428 (diff) | |
disable privsep and enable setuid for the 3.2.2 release
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/servconf.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd.8 | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd_config | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index 25cf4697d6f..e0c94487c1d 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: servconf.c,v 1.108 2002/05/04 02:39:35 deraadt Exp $"); +RCSID("$OpenBSD: servconf.c,v 1.109 2002/05/15 21:02:52 markus Exp $"); #if defined(KRB4) || defined(KRB5) #include <krb.h> @@ -231,9 +231,9 @@ fill_default_server_options(ServerOptions *options) if (options->authorized_keys_file == NULL) options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS; - /* Turn privilege separation on by default */ + /* Turn privilege separation _off_ by default */ if (use_privsep == -1) - use_privsep = 1; + use_privsep = 0; } /* Keyword tokens. */ diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile index 95b092924b3..57f769feb7f 100644 --- a/usr.bin/ssh/ssh/Makefile +++ b/usr.bin/ssh/ssh/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.39 2002/05/11 00:20:20 espie Exp $ +# $OpenBSD: Makefile,v 1.40 2002/05/15 21:02:53 markus Exp $ .PATH: ${.CURDIR}/.. PROG= ssh BINOWN= root -#BINMODE?=4555 +BINMODE?=4555 BINDIR= /usr/bin MAN= ssh.1 diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8 index f56b839500f..632ed4109a6 100644 --- a/usr.bin/ssh/sshd.8 +++ b/usr.bin/ssh/sshd.8 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd.8,v 1.180 2002/05/06 23:34:33 millert Exp $ +.\" $OpenBSD: sshd.8,v 1.181 2002/05/15 21:02:53 markus Exp $ .Dd September 25, 1999 .Dt SSHD 8 .Os @@ -844,7 +844,7 @@ another process will be created that has the privilege of the authenticated user. The goal of privilege separation is to prevent privilege escalation by containing any corruption within the unprivileged processes. The default is -.Dq yes . +.Dq no . .It Cm VerifyReverseMapping Specifies whether .Nm diff --git a/usr.bin/ssh/sshd_config b/usr.bin/ssh/sshd_config index 3dadb2ab7a1..657d6919303 100644 --- a/usr.bin/ssh/sshd_config +++ b/usr.bin/ssh/sshd_config @@ -1,4 +1,4 @@ -# $OpenBSD: sshd_config,v 1.52 2002/05/04 02:39:35 deraadt Exp $ +# $OpenBSD: sshd_config,v 1.53 2002/05/15 21:02:53 markus Exp $ # This is the sshd server system-wide configuration file. See sshd(8) # for more information. @@ -74,7 +74,7 @@ #PrintLastLog yes #KeepAlive yes #UseLogin no -#UsePrivilegeSeparation yes +#UsePrivilegeSeparation no #MaxStartups 10 # no default banner path |