1 files changed, 24 insertions, 8 deletions

diff --git a/ssh.c b/ssh.c
index 0871d06de..a27c45725 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.241 2005/06/06 11:20:36 djm Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.242 2005/06/08 11:25:09 djm Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -386,8 +386,10 @@ again:
                         }
                         break;
                 case 'M':
-                        options.control_master =
-                            (options.control_master >= 1) ? 2 : 1;
+                        if (options.control_master == SSHCTL_MASTER_YES)
+                                options.control_master = SSHCTL_MASTER_ASK;
+                        else
+                                options.control_master = SSHCTL_MASTER_YES;
                         break;
                 case 'p':
                         options.port = a2port(optarg);
@@ -618,11 +620,8 @@ again:
         }
         if (mux_command != 0 && options.control_path == NULL)
                 fatal("No ControlPath specified for \"-O\" command");
-        if (options.control_path != NULL && options.control_master == 0) {
-                if (mux_command == 0)
-                        mux_command = SSHMUX_COMMAND_OPEN;
+        if (options.control_path != NULL)
                 control_client(options.control_path);
-        }
 
         /* Open a connection to the remote host. */
         if (ssh_connect(host, &hostaddr, options.port,
@@ -1086,9 +1085,12 @@ ssh_control_listener(void)
         mode_t old_umask;
         int addr_len;
 
-        if (options.control_path == NULL || options.control_master <= 0)
+        if (options.control_path == NULL ||
+            options.control_master == SSHCTL_MASTER_NO)
                 return;
 
+        debug("setting up multiplex master socket");
+
         memset(&addr, '\0', sizeof(addr));
         addr.sun_family = AF_UNIX;
         addr_len = offsetof(struct sockaddr_un, sun_path) +
@@ -1299,6 +1301,20 @@ control_client(const char *path)
         extern char **environ;
         u_int  flags;
 
+        if (mux_command == 0)
+                mux_command = SSHMUX_COMMAND_OPEN;
+
+        switch (options.control_master) {
+        case SSHCTL_MASTER_AUTO:
+        case SSHCTL_MASTER_AUTO_ASK:
+                debug("auto-mux: Trying existing master");
+                /* FALLTHROUGH */
+        case SSHCTL_MASTER_NO:
+                break;
+        default:
+                return;
+        }
+
         memset(&addr, '\0', sizeof(addr));
         addr.sun_family = AF_UNIX;
         addr_len = offsetof(struct sockaddr_un, sun_path) +