tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/10/01 21:38:53 

[channels.c channels.h ssh.c sshd.c]
     remove ugliness; vp@drexel.edu via angelos
This commit is contained in:
Ben Lindstrom 2001-10-03 17:34:59 +00:00
parent 3e45e4cd00
commit 908afed17f
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -24,6 +24,9 @@
[scp.c] [scp.c]
skip filenames containing \n; report jdamery@chiark.greenend.org.uk skip filenames containing \n; report jdamery@chiark.greenend.org.uk
and matthew@debian.org and matthew@debian.org
- markus@cvs.openbsd.org 2001/10/01 21:38:53
[channels.c channels.h ssh.c sshd.c]
remove ugliness; vp@drexel.edu via angelos
20011001 20011001
- (stevesk) loginrec.c: fix type conversion problems exposed when using - (stevesk) loginrec.c: fix type conversion problems exposed when using
@ -6616,4 +6619,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1576 2001/10/03 17:30:58 mouring Exp $ $Id: ChangeLog,v 1.1577 2001/10/03 17:34:59 mouring Exp $

10
channels.c
View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: channels.c,v 1.134 2001/09/17 21:04:01 markus Exp $"); RCSID("$OpenBSD: channels.c,v 1.135 2001/10/01 21:38:53 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -133,7 +133,7 @@ static char *auth_sock_name = NULL;
static char *auth_sock_dir = NULL; static char *auth_sock_dir = NULL;
/* AF_UNSPEC or AF_INET or AF_INET6 */ /* AF_UNSPEC or AF_INET or AF_INET6 */
extern int IPv4or6; static int IPv4or6 = AF_UNSPEC;
/* helper */ /* helper */
static void port_open_helper(Channel *c, char *rtype); static void port_open_helper(Channel *c, char *rtype);
@ -2037,6 +2037,12 @@ channel_input_port_open(int type, int plen, void *ctxt)
/* -- tcp forwarding */ /* -- tcp forwarding */
void
channel_set_af(int af)
{
IPv4or6 = af;
}
/* /*
* Initiate forwarding of connections to local port "port" through the secure * Initiate forwarding of connections to local port "port" through the secure
* channel to host:port from remote side. * channel to host:port from remote side.

5
channels.h
View File

@ -32,7 +32,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/* RCSID("$OpenBSD: channels.h,v 1.46 2001/09/17 20:52:47 markus Exp $"); */ /* RCSID("$OpenBSD: channels.h,v 1.47 2001/10/01 21:38:53 markus Exp $"); */
#ifndef CHANNEL_H #ifndef CHANNEL_H
#define CHANNEL_H #define CHANNEL_H
@ -182,7 +182,8 @@ int channel_still_open(void);
char *channel_open_message(void); char *channel_open_message(void);
int channel_find_open(void); int channel_find_open(void);
/* channel_tcpfwd.c */ /* tcp forwarding */
void channel_set_af(int af);
void channel_permit_all_opens(void); void channel_permit_all_opens(void);
void channel_add_permitted_opens(char *, int); void channel_add_permitted_opens(char *, int);
void channel_clear_permitted_opens(void); void channel_clear_permitted_opens(void);

3
ssh.c
View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.145 2001/09/28 15:46:29 markus Exp $"); RCSID("$OpenBSD: ssh.c,v 1.146 2001/10/01 21:38:53 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -564,6 +564,7 @@ again:
SSLeay_add_all_algorithms(); SSLeay_add_all_algorithms();
ERR_load_crypto_strings(); ERR_load_crypto_strings();
channel_set_af(IPv4or6);
/* Initialize the command to execute on remote host. */ /* Initialize the command to execute on remote host. */
buffer_init(&command); buffer_init(&command);

3
sshd.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshd.c,v 1.204 2001/08/23 17:59:31 camield Exp $"); RCSID("$OpenBSD: sshd.c,v 1.205 2001/10/01 21:38:53 markus Exp $");
#include <openssl/dh.h> #include <openssl/dh.h>
#include <openssl/bn.h> #include <openssl/bn.h>
@ -669,6 +669,7 @@ main(int ac, char **av)
} }
} }
SSLeay_add_all_algorithms(); SSLeay_add_all_algorithms();
channel_set_af(IPv4or6);
/* /*
* Force logging to stderr until we have loaded the private host * Force logging to stderr until we have loaded the private host