1 files changed, 62 insertions, 9 deletions

diff --git a/sshd.c b/sshd.c
index def90d827..df6d1e374 100644
--- a/sshd.c
+++ b/sshd.c
@@ -377,7 +377,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
                 major = PROTOCOL_MAJOR_1;
                 minor = PROTOCOL_MINOR_1;
         }
-        snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s\n", major, minor, SSH_VERSION);
+        snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s\n", major, minor, SSH_RELEASE);
         server_version_string = xstrdup(buf);
 
         /* Send our protocol version identification. */
@@ -962,7 +962,12 @@ main(int ac, char **av)
                         /* ignored */
                         break;
                 case 'q':
-                        options.log_level = SYSLOG_LEVEL_QUIET;
+                        if (options.log_level == SYSLOG_LEVEL_QUIET) { 
+                                options.log_level = SYSLOG_LEVEL_SILENT; 
+                        } 
+                        else if (options.log_level != SYSLOG_LEVEL_SILENT) { 
+                                options.log_level = SYSLOG_LEVEL_QUIET; 
+                        } 
                         break;
                 case 'b':
                         options.server_key_bits = atoi(optarg);
@@ -1123,10 +1128,12 @@ main(int ac, char **av)
                 logit("Disabling protocol version 1. Could not load host key");
                 options.protocol &= ~SSH_PROTO_1;
         }
+#ifndef GSSAPI
         if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) {
                 logit("Disabling protocol version 2. Could not load host key");
                 options.protocol &= ~SSH_PROTO_2;
         }
+#endif
         if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) {
                 logit("sshd: no hostkeys available -- exiting.");
                 exit(1);
@@ -1313,7 +1320,7 @@ main(int ac, char **av)
 
                         /* Bind the socket to the desired port. */
                         if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) < 0) {
-                                if (!ai->ai_next)
+                                if (!num_listen_socks && !ai->ai_next)
                                     error("Bind to port %s on %s failed: %.200s.",
                                             strport, ntop, strerror(errno));
                                 close(listen_sock);
@@ -1632,7 +1639,7 @@ main(int ac, char **av)
          * Register our connection.  This turns encryption off because we do
          * not have a key.
          */
-        packet_set_connection(sock_in, sock_out);
+        packet_set_connection(sock_in, sock_out, -1);
         packet_set_server();
 
         /* Set SO_KEEPALIVE if requested. */
@@ -2028,13 +2035,59 @@ do_ssh2_kex(void)
         myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types();
 
         /* start key exchange */
-        kex = kex_setup(myproposal);
-        kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;
+  
+#ifdef GSSAPI
+        {
+        char *orig;
+        char *gss = NULL;
+        char *newstr = NULL;
+        orig = myproposal[PROPOSAL_KEX_ALGS];
+
+        /* 
+         * If we don't have a host key, then there's no point advertising
+         * the other key exchange algorithms
+         */
+
+        if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0)
+                orig = NULL;
+
+        gss = ssh_gssapi_server_mechanisms();
+
+        if (gss && orig) {
+                int len = strlen(orig) + strlen(gss) + 2;
+                newstr = xmalloc(len);
+                snprintf(newstr, len, "%s,%s", gss, orig);
+        } else if (gss) {
+                newstr = gss;
+        } else if (orig) {
+                newstr = orig;
+        }
+        /* 
+         * If we've got GSSAPI mechanisms, then we've got the 'null' host
+         * key alg, but we can't tell people about it unless its the only
+         * host key algorithm we support
+         */
+        if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0)
+                myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null";
+
+        if (newstr)
+                myproposal[PROPOSAL_KEX_ALGS] = newstr;
+        else
+                fatal("No supported key exchange algorithms");
+        }
+#endif
+
+        /* start key exchange */
+        kex = kex_setup(myproposal);
+        kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;
         kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
         kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
-        kex->server = 1;
-        kex->client_version_string=client_version_string;
-        kex->server_version_string=server_version_string;
+#ifdef GSSAPI
+        kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;
+#endif
+        kex->server = 1;
+        kex->client_version_string=client_version_string;
+        kex->server_version_string=server_version_string;
         kex->load_host_key=&get_hostkey_by_type;
         kex->host_key_index=&get_hostkey_index;