summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-08 03:39:10 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-08 03:39:10 +0000
commitcebc858ca27e1b3138e346b0094bcdfa08088699 (patch)
tree7260f5b3d7865771d120ae3e640cc9e2d1523f98
parent058316f0f1811ac716c1cb799f50adae4af7928e (diff)
- OpenBSD CVS Sync
- markus@cvs.openbsd.org 2001/03/08 00:15:48 [readconf.c ssh.1] turn off useprivilegedports by default. only rhost-auth needs this. older sshd's may need this, too.
-rw-r--r--ChangeLog14
-rw-r--r--readconf.c4
-rw-r--r--ssh.14
3 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index a8a1a94e1..415000ca4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,13 @@
120010308 120010308
2 - OpenBSD CVS Sync 2 - OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2001/03/07 10:11:23 3 - djm@cvs.openbsd.org 2001/03/07 10:11:23
4 [sftp-client.c sftp-client.h sftp-int.c sftp-server.c sftp.1 sftp.c sftp.h] 4 [sftp-client.c sftp-client.h sftp-int.c sftp-server.c sftp.1 sftp.c sftp.h]
5 Support for new draft (draft-ietf-secsh-filexfer-01). New symlink handling 5 Support for new draft (draft-ietf-secsh-filexfer-01). New symlink handling
6 functions and small protocol change. 6 functions and small protocol change.
7 - markus@cvs.openbsd.org 2001/03/08 00:15:48
8 [readconf.c ssh.1]
9 turn off useprivilegedports by default. only rhost-auth needs
10 this. older sshd's may need this, too.
7 11
820010307 1220010307
9 - (bal) OpenBSD CVS Sync 13 - (bal) OpenBSD CVS Sync
@@ -4437,4 +4441,4 @@
4437 - Wrote replacements for strlcpy and mkdtemp 4441 - Wrote replacements for strlcpy and mkdtemp
4438 - Released 1.0pre1 4442 - Released 1.0pre1
4439 4443
4440$Id: ChangeLog,v 1.925 2001/03/07 23:08:49 djm Exp $ 4444$Id: ChangeLog,v 1.926 2001/03/08 03:39:10 mouring Exp $
diff --git a/readconf.c b/readconf.c
index 33649a8d5..948d7eddf 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: readconf.c,v 1.64 2001/03/04 17:42:28 millert Exp $"); 15RCSID("$OpenBSD: readconf.c,v 1.65 2001/03/08 00:15:47 markus Exp $");
16 16
17#include "ssh.h" 17#include "ssh.h"
18#include "xmalloc.h" 18#include "xmalloc.h"
@@ -745,7 +745,7 @@ fill_default_options(Options * options)
745 if (options->gateway_ports == -1) 745 if (options->gateway_ports == -1)
746 options->gateway_ports = 0; 746 options->gateway_ports = 0;
747 if (options->use_privileged_port == -1) 747 if (options->use_privileged_port == -1)
748 options->use_privileged_port = 1; 748 options->use_privileged_port = 0;
749 if (options->rhosts_authentication == -1) 749 if (options->rhosts_authentication == -1)
750 options->rhosts_authentication = 1; 750 options->rhosts_authentication = 1;
751 if (options->rsa_authentication == -1) 751 if (options->rsa_authentication == -1)
diff --git a/ssh.1 b/ssh.1
index 4426eb661..b4fc1a462 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.97 2001/03/07 04:05:58 deraadt Exp $ 37.\" $OpenBSD: ssh.1,v 1.98 2001/03/08 00:15:48 markus Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -990,7 +990,7 @@ The argument must be
990or 990or
991.Dq no . 991.Dq no .
992The default is 992The default is
993.Dq yes . 993.Dq no .
994Note that setting this option to 994Note that setting this option to
995.Dq no 995.Dq no
996turns off 996turns off