[BACK]Return to sshd.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/sshd.c between version 1.311 and 1.312

version 1.311, 2005/06/17 02:44:33 version 1.312, 2005/07/25 11:59:40
Line 662 
Line 662 
   
         /* It is safe now to apply the key state */          /* It is safe now to apply the key state */
         monitor_apply_keystate(pmonitor);          monitor_apply_keystate(pmonitor);
   
           /*
            * Tell the packet layer that authentication was successful, since
            * this information is not part of the key state.
            */
           packet_set_authenticated();
 }  }
   
 static char *  static char *
Line 1551 
Line 1557 
          * not have a key.           * not have a key.
          */           */
         packet_set_connection(sock_in, sock_out);          packet_set_connection(sock_in, sock_out);
           packet_set_server();
   
         /* Set SO_KEEPALIVE if requested. */          /* Set SO_KEEPALIVE if requested. */
         if (options.tcp_keep_alive && packet_connection_is_on_socket() &&          if (options.tcp_keep_alive && packet_connection_is_on_socket() &&
Line 1899 
Line 1906 
                 myproposal[PROPOSAL_MAC_ALGS_CTOS] =                  myproposal[PROPOSAL_MAC_ALGS_CTOS] =
                 myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;                  myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
         }          }
         if (!options.compression) {          if (options.compression == COMP_NONE) {
                 myproposal[PROPOSAL_COMP_ALGS_CTOS] =                  myproposal[PROPOSAL_COMP_ALGS_CTOS] =
                 myproposal[PROPOSAL_COMP_ALGS_STOC] = "none";                  myproposal[PROPOSAL_COMP_ALGS_STOC] = "none";
           } else if (options.compression == COMP_DELAYED) {
                   myproposal[PROPOSAL_COMP_ALGS_CTOS] =
                   myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com";
         }          }
   
         myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types();          myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types();
   
         /* start key exchange */          /* start key exchange */

Legend:
Removed from v.1.311  
changed lines
  Added in v.1.312