[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree
zrouter-src-freebsd at zrouter.org
zrouter-src-freebsd at zrouter.org
Fri Mar 2 15:37:25 UTC 2012
details: http://zrouter.org/hg/FreeBSD/head//rev/6bc1ed3b57c3
changeset: 347:6bc1ed3b57c3
user: ray at terran.dlink.ua
date: Fri Mar 02 16:50:56 2012 +0200
description:
Update to FreeBSD-HEAD @232391
diffstat:
head/crypto/openssh/auth2.c | 40 +++++++++++++++++++-------------------
head/crypto/openssh/channels.c | 18 ++++++++--------
head/crypto/openssh/channels.h | 10 +++-----
head/crypto/openssh/kex.c | 6 ++--
head/crypto/openssh/loginrec.c | 5 ----
head/crypto/openssh/readconf.c | 15 +++++++------
head/crypto/openssh/readconf.h | 3 +-
head/crypto/openssh/servconf.c | 8 +++---
head/crypto/openssh/sftp.1 | 4 +-
head/crypto/openssh/ssh.c | 5 ++-
head/crypto/openssh/sshd.c | 10 ++++----
head/crypto/openssh/sshd_config.5 | 4 +-
head/crypto/openssh/version.h | 8 +++---
13 files changed, 66 insertions(+), 70 deletions(-)
diffs (452 lines):
diff -r 3914c6e62521 -r 6bc1ed3b57c3 head/crypto/openssh/auth2.c
--- a/head/crypto/openssh/auth2.c Tue Feb 28 13:43:57 2012 +0200
+++ b/head/crypto/openssh/auth2.c Fri Mar 02 16:50:56 2012 +0200
@@ -24,7 +24,7 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD: head/crypto/openssh/auth2.c 226046 2011-10-05 22:08:17Z des $");
+__RCSID("$FreeBSD: head/crypto/openssh/auth2.c 231584 2012-02-13 11:59:59Z ed $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -223,8 +223,8 @@
login_cap_t *lc;
const char *from_host, *from_ip;
- from_host = get_canonical_hostname(options.use_dns);
- from_ip = get_remote_ipaddr();
+ from_host = get_canonical_hostname(options.use_dns);
+ from_ip = get_remote_ipaddr();
#endif
if (authctxt == NULL)
@@ -272,23 +272,23 @@
}
#ifdef HAVE_LOGIN_CAP
- if (authctxt->pw != NULL) {
- lc = login_getpwclass(authctxt->pw);
- if (lc == NULL)
- lc = login_getclassbyname(NULL, authctxt->pw);
- if (!auth_hostok(lc, from_host, from_ip)) {
- logit("Denied connection for %.200s from %.200s [%.200s].",
- authctxt->pw->pw_name, from_host, from_ip);
- packet_disconnect("Sorry, you are not allowed to connect.");
- }
- if (!auth_timeok(lc, time(NULL))) {
- logit("LOGIN %.200s REFUSED (TIME) FROM %.200s",
- authctxt->pw->pw_name, from_host);
- packet_disconnect("Logins not available right now.");
- }
- login_close(lc);
- lc = NULL;
- }
+ if (authctxt->pw != NULL) {
+ lc = login_getpwclass(authctxt->pw);
+ if (lc == NULL)
+ lc = login_getclassbyname(NULL, authctxt->pw);
+ if (!auth_hostok(lc, from_host, from_ip)) {
+ logit("Denied connection for %.200s from %.200s [%.200s].",
+ authctxt->pw->pw_name, from_host, from_ip);
+ packet_disconnect("Sorry, you are not allowed to connect.");
+ }
+ if (!auth_timeok(lc, time(NULL))) {
+ logit("LOGIN %.200s REFUSED (TIME) FROM %.200s",
+ authctxt->pw->pw_name, from_host);
+ packet_disconnect("Logins not available right now.");
+ }
+ login_close(lc);
+ lc = NULL;
+ }
#endif /* HAVE_LOGIN_CAP */
/* reset state */
diff -r 3914c6e62521 -r 6bc1ed3b57c3 head/crypto/openssh/channels.c
--- a/head/crypto/openssh/channels.c Tue Feb 28 13:43:57 2012 +0200
+++ b/head/crypto/openssh/channels.c Fri Mar 02 16:50:56 2012 +0200
@@ -1,5 +1,5 @@
/* $OpenBSD: channels.c,v 1.311 2011/06/22 22:08:42 djm Exp $ */
-/* $FreeBSD: head/crypto/openssh/channels.c 226046 2011-10-05 22:08:17Z des $ */
+/* $FreeBSD: head/crypto/openssh/channels.c 231584 2012-02-13 11:59:59Z ed $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -824,7 +824,7 @@
u_int maxlen;
/* If we are not on a socket return 128KB. */
- if (!packet_connection_is_on_socket())
+ if (!packet_connection_is_on_socket())
return (128 * 1024);
tcpwinsz = 0;
@@ -854,7 +854,7 @@
limit = MIN(compat20 ? c->remote_window : packet_get_maxsize(),
2 * c->tcpwinsz);
-
+
if (c->istate == CHAN_INPUT_OPEN &&
limit > 0 &&
buffer_len(&c->input) < limit &&
@@ -2687,10 +2687,10 @@
IPv4or6 = af;
}
-void
+void
channel_set_hpn(int disabled, u_int buf_size)
{
- hpn_disabled = disabled;
+ hpn_disabled = disabled;
buffer_size = buf_size;
debug("HPN Disabled: %d, HPN Buffer Size: %d",
hpn_disabled, buffer_size);
@@ -2856,10 +2856,10 @@
c = channel_new("port listener", type, sock, sock, -1,
CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT,
0, "port listener", 1);
- else
- c = channel_new("port listener", type, sock, sock, -1,
- buffer_size, CHAN_TCP_PACKET_DEFAULT,
- 0, "port listener", 1);
+ else
+ c = channel_new("port listener", type, sock, sock, -1,
+ buffer_size, CHAN_TCP_PACKET_DEFAULT,
+ 0, "port listener", 1);
c->path = xstrdup(host);
c->host_port = port_to_connect;
c->listening_port = listen_port;
diff -r 3914c6e62521 -r 6bc1ed3b57c3 head/crypto/openssh/channels.h
--- a/head/crypto/openssh/channels.h Tue Feb 28 13:43:57 2012 +0200
+++ b/head/crypto/openssh/channels.h Fri Mar 02 16:50:56 2012 +0200
@@ -1,5 +1,5 @@
/* $OpenBSD: channels.h,v 1.105 2011/06/22 22:08:42 djm Exp $ */
-/* $FreeBSD: head/crypto/openssh/channels.h 226046 2011-10-05 22:08:17Z des $ */
+/* $FreeBSD: head/crypto/openssh/channels.h 231584 2012-02-13 11:59:59Z ed $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
@@ -126,7 +126,7 @@
u_int local_window_max;
u_int local_consumed;
u_int local_maxpacket;
- u_int tcpwinsz;
+ u_int tcpwinsz;
int dynamic_window;
int extended_usage;
int single_connection;
@@ -165,13 +165,10 @@
/* default window/packet sizes for tcp/x11-fwd-channel */
#define CHAN_SES_PACKET_DEFAULT (32*1024)
#define CHAN_SES_WINDOW_DEFAULT (64*CHAN_SES_PACKET_DEFAULT)
-
#define CHAN_TCP_PACKET_DEFAULT (32*1024)
#define CHAN_TCP_WINDOW_DEFAULT (64*CHAN_TCP_PACKET_DEFAULT)
-
#define CHAN_X11_PACKET_DEFAULT (16*1024)
#define CHAN_X11_WINDOW_DEFAULT (4*CHAN_X11_PACKET_DEFAULT)
-
#define CHAN_HPN_MIN_WINDOW_DEFAULT (2*1024*1024)
/* possible input states */
@@ -302,6 +299,7 @@
void chan_obuf_empty(Channel *);
/* hpn handler */
-void channel_set_hpn(int, u_int);
+
+void channel_set_hpn(int, u_int);
#endif
diff -r 3914c6e62521 -r 6bc1ed3b57c3 head/crypto/openssh/kex.c
--- a/head/crypto/openssh/kex.c Tue Feb 28 13:43:57 2012 +0200
+++ b/head/crypto/openssh/kex.c Fri Mar 02 16:50:56 2012 +0200
@@ -1,5 +1,5 @@
/* $OpenBSD: kex.c,v 1.86 2010/09/22 05:01:29 djm Exp $ */
-/* $FreeBSD: head/crypto/openssh/kex.c 224640 2011-08-03 20:00:36Z brooks $ */
+/* $FreeBSD: head/crypto/openssh/kex.c 231584 2012-02-13 11:59:59Z ed $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
*
@@ -457,13 +457,13 @@
#ifdef NONE_CIPHER_ENABLED
debug("REQUESTED ENC.NAME is '%s'", newkeys->enc.name);
if (strcmp(newkeys->enc.name, "none") == 0) {
- debug("Requesting NONE. Authflag is %d", auth_flag);
+ debug("Requesting NONE. Authflag is %d", auth_flag);
if (auth_flag == 1)
debug("None requested post authentication.");
else
fatal("Pre-authentication none cipher requests "
"are not allowed.");
- }
+ }
#endif
debug("kex: %s %s %s %s",
ctos ? "client->server" : "server->client",
diff -r 3914c6e62521 -r 6bc1ed3b57c3 head/crypto/openssh/loginrec.c
--- a/head/crypto/openssh/loginrec.c Tue Feb 28 13:43:57 2012 +0200
+++ b/head/crypto/openssh/loginrec.c Fri Mar 02 16:50:56 2012 +0200
@@ -146,7 +146,6 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD: head/crypto/openssh/loginrec.c 221420 2011-05-04 07:34:44Z des $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -516,10 +515,6 @@
return (utmpx_get_entry(li));
#endif
-#if 1
- return (utmpx_get_entry(li));
-#endif
-
#if defined(DISABLE_LASTLOG)
/* On some systems we shouldn't even try to obtain last login
* time, e.g. AIX */
diff -r 3914c6e62521 -r 6bc1ed3b57c3 head/crypto/openssh/readconf.c
--- a/head/crypto/openssh/readconf.c Tue Feb 28 13:43:57 2012 +0200
+++ b/head/crypto/openssh/readconf.c Fri Mar 02 16:50:56 2012 +0200
@@ -1,5 +1,5 @@
/* $OpenBSD: readconf.c,v 1.193 2011/05/24 07:15:47 djm Exp $ */
-/* $FreeBSD: head/crypto/openssh/readconf.c 226046 2011-10-05 22:08:17Z des $ */
+/* $FreeBSD: head/crypto/openssh/readconf.c 231584 2012-02-13 11:59:59Z ed $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -14,7 +14,7 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD: head/crypto/openssh/readconf.c 226046 2011-10-05 22:08:17Z des $");
+__RCSID("$FreeBSD: head/crypto/openssh/readconf.c 231584 2012-02-13 11:59:59Z ed $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -264,6 +264,7 @@
{ "noneswitch", oNoneSwitch },
#endif
{ "versionaddendum", oVersionAddendum },
+
{ NULL, oBadOption }
};
@@ -1092,9 +1093,9 @@
case oNoneEnabled:
intptr = &options->none_enabled;
goto parse_flag;
-
+
/*
- * We check to see if the command comes from the command line or not.
+ * We check to see if the command comes from the command line or not.
* If it does then enable it otherwise fail. NONE must never be a
* default configuration.
*/
@@ -1110,7 +1111,7 @@
"from the command line", filename);
error("Continuing...");
return 0;
- }
+ }
#endif
case oVersionAddendum:
@@ -1458,7 +1459,7 @@
/* options->host_key_alias should not be set by default */
/* options->preferred_authentications will be set in ssh */
if (options->hpn_disabled == -1)
- options->hpn_disabled = 0;
+ options->hpn_disabled = 0;
if (options->hpn_buffer_size > -1)
{
u_int maxlen;
@@ -1478,7 +1479,7 @@
}
if (options->tcp_rcv_buf == 0)
options->tcp_rcv_buf = 1;
- if (options->tcp_rcv_buf > -1)
+ if (options->tcp_rcv_buf > -1)
options->tcp_rcv_buf *= 1024;
if (options->tcp_rcv_buf_poll == -1)
options->tcp_rcv_buf_poll = 1;
diff -r 3914c6e62521 -r 6bc1ed3b57c3 head/crypto/openssh/readconf.h
--- a/head/crypto/openssh/readconf.h Tue Feb 28 13:43:57 2012 +0200
+++ b/head/crypto/openssh/readconf.h Fri Mar 02 16:50:56 2012 +0200
@@ -1,5 +1,5 @@
/* $OpenBSD: readconf.h,v 1.90 2011/05/24 07:15:47 djm Exp $ */
-/* $FreeBSD: head/crypto/openssh/readconf.h 226046 2011-10-05 22:08:17Z des $ */
+/* $FreeBSD: head/crypto/openssh/readconf.h 231584 2012-02-13 11:59:59Z ed $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
@@ -133,6 +133,7 @@
int visual_host_key;
int use_roaming;
+
int request_tty;
int hpn_disabled; /* Switch to disable HPN buffer management. */
diff -r 3914c6e62521 -r 6bc1ed3b57c3 head/crypto/openssh/servconf.c
--- a/head/crypto/openssh/servconf.c Tue Feb 28 13:43:57 2012 +0200
+++ b/head/crypto/openssh/servconf.c Fri Mar 02 16:50:56 2012 +0200
@@ -1,5 +1,5 @@
/* $OpenBSD: servconf.c,v 1.222 2011/06/22 21:57:01 djm Exp $ */
-/* $FreeBSD: head/crypto/openssh/servconf.c 226046 2011-10-05 22:08:17Z des $ */
+/* $FreeBSD: head/crypto/openssh/servconf.c 231584 2012-02-13 11:59:59Z ed $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD: head/crypto/openssh/servconf.c 226046 2011-10-05 22:08:17Z des $");
+__RCSID("$FreeBSD: head/crypto/openssh/servconf.c 231584 2012-02-13 11:59:59Z ed $");
#include <sys/types.h>
#include <sys/socket.h>
@@ -166,7 +166,7 @@
_PATH_HOST_KEY_FILE;
if (options->protocol & SSH_PROTO_2) {
options->host_key_files[options->num_host_key_files++] =
- _PATH_HOST_RSA_KEY_FILE;
+ _PATH_HOST_RSA_KEY_FILE;
options->host_key_files[options->num_host_key_files++] =
_PATH_HOST_DSA_KEY_FILE;
#ifdef OPENSSL_HAS_ECC
@@ -286,7 +286,7 @@
options->ip_qos_interactive = IPTOS_LOWDELAY;
if (options->ip_qos_bulk == -1)
options->ip_qos_bulk = IPTOS_THROUGHPUT;
- if (options->hpn_disabled == -1)
+ if (options->hpn_disabled == -1)
options->hpn_disabled = 0;
if (options->hpn_buffer_size == -1) {
/*
diff -r 3914c6e62521 -r 6bc1ed3b57c3 head/crypto/openssh/sftp.1
--- a/head/crypto/openssh/sftp.1 Tue Feb 28 13:43:57 2012 +0200
+++ b/head/crypto/openssh/sftp.1 Fri Mar 02 16:50:56 2012 +0200
@@ -1,5 +1,5 @@
.\" $OpenBSD: sftp.1,v 1.90 2011/08/07 12:55:30 dtucker Exp $
-.\" $FreeBSD: head/crypto/openssh/sftp.1 226046 2011-10-05 22:08:17Z des $
+.\" $FreeBSD: head/crypto/openssh/sftp.1 231584 2012-02-13 11:59:59Z ed $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@@ -246,7 +246,7 @@
Specify how many requests may be outstanding at any one time.
Increasing this may slightly improve file transfer speed
but will increase memory usage.
-The default is 256 outstanding requests providing for 8MB
+The default is 256 outstanding requests providing for 8MB
of outstanding data with a 32KB buffer.
.It Fl r
Recursively copy entire directories when uploading and downloading.
diff -r 3914c6e62521 -r 6bc1ed3b57c3 head/crypto/openssh/ssh.c
--- a/head/crypto/openssh/ssh.c Tue Feb 28 13:43:57 2012 +0200
+++ b/head/crypto/openssh/ssh.c Fri Mar 02 16:50:56 2012 +0200
@@ -1,5 +1,5 @@
/* $OpenBSD: ssh.c,v 1.364 2011/08/02 23:15:03 djm Exp $ */
-/* $FreeBSD: head/crypto/openssh/ssh.c 226046 2011-10-05 22:08:17Z des $ */
+/* $FreeBSD: head/crypto/openssh/ssh.c 231584 2012-02-13 11:59:59Z ed $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -42,7 +42,7 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD: head/crypto/openssh/ssh.c 226046 2011-10-05 22:08:17Z des $");
+__RCSID("$FreeBSD: head/crypto/openssh/ssh.c 231584 2012-02-13 11:59:59Z ed $");
#include <sys/types.h>
#ifdef HAVE_SYS_STAT_H
@@ -1461,6 +1461,7 @@
c->dynamic_window = 1;
debug("Enabled Dynamic Window Scaling\n");
}
+
debug3("ssh_session2_open: channel_new: %d", c->self);
channel_send_open(c->self);
diff -r 3914c6e62521 -r 6bc1ed3b57c3 head/crypto/openssh/sshd.c
--- a/head/crypto/openssh/sshd.c Tue Feb 28 13:43:57 2012 +0200
+++ b/head/crypto/openssh/sshd.c Fri Mar 02 16:50:56 2012 +0200
@@ -1,5 +1,5 @@
/* $OpenBSD: sshd.c,v 1.385 2011/06/23 09:34:13 djm Exp $ */
-/* $FreeBSD: head/crypto/openssh/sshd.c 226046 2011-10-05 22:08:17Z des $ */
+/* $FreeBSD: head/crypto/openssh/sshd.c 231584 2012-02-13 11:59:59Z ed $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -44,7 +44,7 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD: head/crypto/openssh/sshd.c 226046 2011-10-05 22:08:17Z des $");
+__RCSID("$FreeBSD: head/crypto/openssh/sshd.c 231584 2012-02-13 11:59:59Z ed $");
#include <sys/types.h>
#include <sys/ioctl.h>
@@ -1916,11 +1916,11 @@
#ifdef __FreeBSD__
/*
* Initialize the resolver. This may not happen automatically
- * before privsep chroot().
+ * before privsep chroot().
*/
if ((_res.options & RES_INIT) == 0) {
- debug("res_init()");
- res_init();
+ debug("res_init()");
+ res_init();
}
#ifdef GSSAPI
/*
diff -r 3914c6e62521 -r 6bc1ed3b57c3 head/crypto/openssh/sshd_config.5
--- a/head/crypto/openssh/sshd_config.5 Tue Feb 28 13:43:57 2012 +0200
+++ b/head/crypto/openssh/sshd_config.5 Fri Mar 02 16:50:56 2012 +0200
@@ -34,7 +34,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: sshd_config.5,v 1.135 2011/08/02 01:22:11 djm Exp $
-.\" $FreeBSD: head/crypto/openssh/sshd_config.5 226046 2011-10-05 22:08:17Z des $
+.\" $FreeBSD: head/crypto/openssh/sshd_config.5 231584 2012-02-13 11:59:59Z ed $
.Dd August 2, 2011
.Dt SSHD_CONFIG 5
.Os
@@ -499,7 +499,7 @@
.Pp
.Pa /etc/hosts.equiv
and
-.Pa /etc/ssh/shosts.equiv
+.Pa /etc/ssh/shosts.equiv
are still used.
The default is
.Dq yes .
diff -r 3914c6e62521 -r 6bc1ed3b57c3 head/crypto/openssh/version.h
--- a/head/crypto/openssh/version.h Tue Feb 28 13:43:57 2012 +0200
+++ b/head/crypto/openssh/version.h Fri Mar 02 16:50:56 2012 +0200
@@ -1,12 +1,12 @@
/* $OpenBSD: version.h,v 1.62 2011/08/02 23:13:01 djm Exp $ */
-/* $FreeBSD: head/crypto/openssh/version.h 226046 2011-10-05 22:08:17Z des $ */
+/* $FreeBSD: head/crypto/openssh/version.h 231584 2012-02-13 11:59:59Z ed $ */
#ifndef SSH_VERSION
-#define SSH_VERSION_BASE "OpenSSH_5.9p1"
-#define SSH_VERSION_ADDENDUM "FreeBSD-20111001"
+#define SSH_VERSION_BASE "OpenSSH_5.9p1"
+#define SSH_VERSION_ADDENDUM "FreeBSD-20111001"
#define SSH_VERSION_HPN "_hpn13v11"
#define SSH_VERSION SSH_VERSION_BASE SSH_VERSION_HPN " " SSH_VERSION_ADDENDUM
-#define SSH_RELEASE (ssh_version_get())
+#define SSH_RELEASE (ssh_version_get())
const char *ssh_version_get(void);
void ssh_version_set_addendum(const char *);
More information about the Zrouter-src-freebsd
mailing list