*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.134 2001/08/01 23:38:45 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.147 2001/10/08 19:05:05 markus Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
*/
Options options;
+/* optional user configfile */
+char *config = NULL;
+
/*
* Name of the host we are connecting to. This is the name given on the
* command line, or the HostName specified for the user-supplied name in a
fprintf(stderr, "Options:\n");
fprintf(stderr, " -l user Log in using this user name.\n");
fprintf(stderr, " -n Redirect input from " _PATH_DEVNULL ".\n");
+ fprintf(stderr, " -F config Config file (default: ~/%s).\n",
+ _PATH_SSH_USER_CONFFILE);
fprintf(stderr, " -A Enable authentication agent forwarding.\n");
fprintf(stderr, " -a Disable authentication agent forwarding (default).\n");
#ifdef AFS
fprintf(stderr, " -x Disable X11 connection forwarding (default).\n");
fprintf(stderr, " -i file Identity for public key authentication "
"(default: ~/.ssh/identity)\n");
+#ifdef SMARTCARD
+ fprintf(stderr, " -I reader Set smartcard reader.\n");
+#endif
fprintf(stderr, " -t Tty; allocate a tty even if command is given.\n");
fprintf(stderr, " -T Do not allocate a tty.\n");
fprintf(stderr, " -v Verbose; display verbose debugging messages.\n");
fprintf(stderr, " -R listen-port:host:port Forward remote port to local address\n");
fprintf(stderr, " These cause %s to listen for connections on a port, and\n", __progname);
fprintf(stderr, " forward them to the other side by connecting to host:port.\n");
+ fprintf(stderr, " -D port Enable dynamic application-level port forwarding.\n");
fprintf(stderr, " -C Enable compression.\n");
fprintf(stderr, " -N Do not execute a shell or command.\n");
fprintf(stderr, " -g Allow remote hosts to connect to forwarded ports.\n");
{
int i, opt, exit_status, cerr;
u_short fwd_port, fwd_host_port;
+ char sfwd_port[6], sfwd_host_port[6];
char *p, *cp, buf[256];
struct stat st;
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]);
again:
while ((opt = getopt(ac, av,
- "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:I:L:NPR:TVX")) != -1) {
+ "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:NPR:TVX")) != -1) {
switch (opt) {
case '1':
options.protocol = SSH_PROTO_1;
case 'l':
options.user = optarg;
break;
+
+ case 'L':
case 'R':
- if (sscanf(optarg, "%hu/%255[^/]/%hu", &fwd_port, buf,
- &fwd_host_port) != 3 &&
- sscanf(optarg, "%hu:%255[^:]:%hu", &fwd_port, buf,
- &fwd_host_port) != 3) {
+ if (sscanf(optarg, "%5[0-9]:%255[^:]:%5[0-9]",
+ sfwd_port, buf, sfwd_host_port) != 3 &&
+ sscanf(optarg, "%5[0-9]/%255[^/]/%5[0-9]",
+ sfwd_port, buf, sfwd_host_port) != 3) {
fprintf(stderr,
- "Bad forwarding specification '%s'.\n",
+ "Bad forwarding specification '%s'\n",
optarg);
usage();
/* NOTREACHED */
}
- add_remote_forward(&options, fwd_port, buf,
- fwd_host_port);
- break;
- case 'L':
- if (sscanf(optarg, "%hu/%255[^/]/%hu", &fwd_port, buf,
- &fwd_host_port) != 3 &&
- sscanf(optarg, "%hu:%255[^:]:%hu", &fwd_port, buf,
- &fwd_host_port) != 3) {
+ if ((fwd_port = a2port(sfwd_port)) == 0 ||
+ (fwd_host_port = a2port(sfwd_host_port)) == 0) {
fprintf(stderr,
- "Bad forwarding specification '%s'.\n",
- optarg);
- usage();
- /* NOTREACHED */
+ "Bad forwarding port(s) '%s'\n", optarg);
+ exit(1);
}
- add_local_forward(&options, fwd_port, buf,
- fwd_host_port);
+ if (opt == 'L')
+ add_local_forward(&options, fwd_port, buf,
+ fwd_host_port);
+ else if (opt == 'R')
+ add_remote_forward(&options, fwd_port, buf,
+ fwd_host_port);
break;
case 'D':
case 'b':
options.bind_address = optarg;
break;
+ case 'F':
+ config = optarg;
+ break;
default:
usage();
}
SSLeay_add_all_algorithms();
ERR_load_crypto_strings();
+ channel_set_af(IPv4or6);
/* Initialize the command to execute on remote host. */
buffer_init(&command);
log_init(av[0], options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level,
SYSLOG_FACILITY_USER, 1);
- /* Read per-user configuration file. */
- snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, _PATH_SSH_USER_CONFFILE);
- read_config_file(buf, host, &options);
-
- /* Read systemwide configuration file. */
- read_config_file(_PATH_HOST_CONFIG_FILE, host, &options);
+ /*
+ * Read per-user configuration file. Ignore the system wide config
+ * file if the user specifies a config file on the command line.
+ */
+ if (config != NULL) {
+ if (!read_config_file(config, host, &options))
+ fatal("Can't open user config file %.100s: "
+ "%.100s", config, strerror(errno));
+ } 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 after use config. */
+ (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, &options);
+ }
/* Fill configuration defaults. */
fill_default_options(&options);
/* 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);
* Now that we are back to our own permissions, create ~/.ssh
* directory if it doesn\'t already exist.
*/
- snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, _PATH_SSH_USER_DIR);
+ snprintf(buf, sizeof buf, "%.100s%s%.100s", pw->pw_dir, strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR);
if (stat(buf, &st) < 0)
if (mkdir(buf, 0700) < 0)
error("Could not create directory '%.200s'.", buf);
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)
key_free(public);
}
-#endif
+#endif /* SMARTCARD */
for (; i < options.num_identity_files; i++) {
filename = tilde_expand_filename(options.identity_files[i],
original_real_uid);
andersk / openssh.git / blobdiff