*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.142 2001/09/03 20:58:33 stevesk Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.147 2001/10/08 19:05:05 markus Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
struct passwd *pw;
int dummy;
uid_t original_effective_uid;
- extern int optopt;
- extern int optind;
- extern int optreset;
+ extern int optind, optreset;
extern char *optarg;
__progname = get_progname(av[0]);
SSLeay_add_all_algorithms();
ERR_load_crypto_strings();
+ channel_set_af(IPv4or6);
/* Initialize the command to execute on remote host. */
buffer_init(&command);
} else {
snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir,
_PATH_SSH_USER_CONFFILE);
+ (void)read_config_file(buf, host, &options);
- /* Read systemwide configuration file. */
+ /* Read systemwide configuration file after use config. */
(void)read_config_file(_PATH_HOST_CONFIG_FILE, host, &options);
- (void)read_config_file(buf, host, &options);
}
/* Fill configuration defaults. */
/* Open a connection to the remote host. */
- cerr = ssh_connect(host, &hostaddr, options.port,
+ cerr = ssh_connect(host, &hostaddr, options.port, IPv4or6,
options.connection_attempts,
original_effective_uid != 0 || !options.use_privileged_port,
pw, options.proxy_command);
len, buffer_ptr(&command), id);
}
+/* request pty/x11/agent/tcpfwd/shell for channel */
static void
-ssh_session2_callback(int id, void *arg)
+ssh_session2_setup(int id, void *arg)
{
int len;
int interactive = 0;
struct termios tio;
- debug("client_init id %d arg %ld", id, (long)arg);
+ debug("ssh_session2_setup: id %d", id);
if (tty_flag) {
struct winsize ws;
packet_set_interactive(interactive);
}
+/* open new channel for a session */
static int
-ssh_session2_command(void)
+ssh_session2_open(void)
{
Channel *c;
int window, packetmax, in, out, err;
window, packetmax, CHAN_EXTENDED_WRITE,
xstrdup("client-session"), /*nonblock*/0);
if (c == NULL)
- fatal("ssh_session2_command: channel_new failed");
+ fatal("ssh_session2_open: channel_new failed");
- debug3("ssh_session2_command: channel_new: %d", c->self);
+ debug3("ssh_session2_open: channel_new: %d", c->self);
channel_send_open(c->self);
- channel_register_callback(c->self, SSH2_MSG_CHANNEL_OPEN_CONFIRMATION,
- ssh_session2_callback, (void *)0);
+ if (!no_shell_flag)
+ channel_register_callback(c->self,
+ SSH2_MSG_CHANNEL_OPEN_CONFIRMATION,
+ ssh_session2_setup, (void *)0);
return c->self;
}
static int
ssh_session2(void)
{
- int id;
+ int id = -1;
/* XXX should be pre-session */
ssh_init_forwarding();
- id = no_shell_flag ? -1 : ssh_session2_command();
+ if (!no_shell_flag || (datafellows & SSH_BUG_DUMMYCHAN))
+ id = ssh_session2_open();
/* If requested, let ssh continue in the background. */
if (fork_after_authentication_flag)