- markus@cvs.openbsd.org 2001/08/30 22:22:32

[openssh.git] / ssh.c

diff --git a/ssh.c b/ssh.c
index 09e4ee5406be57be8d7c05681da9d80aad534f3d..d500e8493f1b6c703d98fcf17b5c1d25b9c1d24f 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.138 2001/08/11 22:51:27 jakob Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.141 2001/08/29 23:27:23 stevesk Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -118,6 +118,9 @@ int fork_after_authentication_flag = 0;
  */
 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
@@ -160,6 +163,8 @@ usage(void)
        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
@@ -189,6 +194,7 @@ usage(void)
        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");
@@ -252,6 +258,7 @@ main(int ac, char **av)
 {
        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;
@@ -315,7 +322,7 @@ main(int ac, char **av)
 
 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;
@@ -464,33 +471,31 @@ again:
                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':
@@ -525,6 +530,9 @@ again:
                case 'b':
                        options.bind_address = optarg;
                        break;
+               case 'F':
+                       config = optarg;
+                       break;
                default:
                        usage();
                }
@@ -609,12 +617,20 @@ again:
        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) {
+               read_config_file(config, host, &options);
+       } else  {
+               snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir,
+                   _PATH_SSH_USER_CONFFILE);
+
+               /* Read systemwide configuration file. */
+               read_config_file(_PATH_HOST_CONFIG_FILE, host, &options);
+               read_config_file(buf, host, &options);
+       }
 
        /* Fill configuration defaults. */
        fill_default_options(&options);