- markus@cvs.openbsd.org 2002/05/15 21:56:38

     [servconf.c sshd.8 sshd_config]
     re-enable privsep and disable setuid for post-3.2.2

diff --git a/ChangeLog b/ChangeLog
index e03361ef785ebab10ef906275d9f134d158ae837..52b3aa22035ed42b08d7a9857b1622545fc6f672 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20020606
+ - (bal) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2002/05/15 21:56:38
+     [servconf.c sshd.8 sshd_config]
+     re-enable privsep and disable setuid for post-3.2.2
+
 20020604
  - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed
    setsockopt from debug to error for now).

diff --git a/servconf.c b/servconf.c
index 5f8e74e331bab5aac38cc6193b5486a591427f37..7a776ac8e8a797a7a5134a72e62eaac42dfa6833 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.109 2002/05/15 21:02:52 markus Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.110 2002/05/15 21:56:38 markus Exp $");
 
 #if defined(KRB4)
 #include <krb.h>
@@ -250,9 +250,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 _off_ by default */
+       /* Turn privilege separation on by default */
        if (use_privsep == -1)
-               use_privsep = 0;
+               use_privsep = 1;
 }
 
 /* Keyword tokens. */

diff --git a/sshd.8 b/sshd.8
index 138bf6510694fde134ba1dd3a841799d61b429f6..114abd835432f4a13fbd3712eda0a965c8ad0e72 100644 (file)
--- a/sshd.8
+++ b/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.181 2002/05/15 21:02:53 markus Exp $
+.\" $OpenBSD: sshd.8,v 1.182 2002/05/15 21:56:38 markus Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -852,7 +852,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 no .
+.Dq yes .
 .It Cm VerifyReverseMapping
 Specifies whether
 .Nm

diff --git a/sshd_config b/sshd_config
index e96f7a1d30d4987487e68e3fddd010c5d312abcd..b870cb4346f7d6edee7f4d128b7e1243afb5c235 100644 (file)
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.53 2002/05/15 21:02:53 markus Exp $
+#      $OpenBSD: sshd_config,v 1.54 2002/05/15 21:56:38 markus Exp $
 
 # This is the sshd server system-wide configuration file.  See sshd(8)
 # for more information.
@@ -80,7 +80,7 @@
 #PrintLastLog yes
 #KeepAlive yes
 #UseLogin no
-#UsePrivilegeSeparation no
+#UsePrivilegeSeparation yes
 
 #MaxStartups 10
 # no default banner path