← Back to branch summary

~ubuntu-branches/debian/sid/openssh/sid

« back to all changes in this revision

Viewing changes to sshd.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2004-10-07 18:03:06 UTC
  • Revision ID: james.westby@ubuntu.com-20041007180306-0l8ii961txetbucx
Tags: 1:3.8.1p1-11ubuntu3
* Nathaniel McCallum:
  - debian/openssh-server.init: pretty initscript
  - debian/control: versioned depend on lsb-base

Show diffs side-by-side

added added

removed removed

Lines of Context:
sshd.c
855
855
                        /* ignored */
856
856
                        break;
857
857
                case 'q':
858
 
                        options.log_level = SYSLOG_LEVEL_QUIET;
 
858
                        if (options.log_level == SYSLOG_LEVEL_QUIET) { 
 
859
                                options.log_level = SYSLOG_LEVEL_SILENT; 
 
860
                        } 
 
861
                        else if (options.log_level != SYSLOG_LEVEL_SILENT) { 
 
862
                                options.log_level = SYSLOG_LEVEL_QUIET; 
 
863
                        } 
859
864
                        break;
860
865
                case 'b':
861
866
                        options.server_key_bits = atoi(optarg);
1158
1163
 
1159
1164
                        /* Bind the socket to the desired port. */
1160
1165
                        if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) < 0) {
1161
 
                                if (!ai->ai_next)
 
1166
                                if (!num_listen_socks && !ai->ai_next)
1162
1167
                                    error("Bind to port %s on %s failed: %.200s.",
1163
1168
                                            strport, ntop, strerror(errno));
1164
1169
                                close(listen_sock);
1419
1424
         * Register our connection.  This turns encryption off because we do
1420
1425
         * not have a key.
1421
1426
         */
1422
 
        packet_set_connection(sock_in, sock_out);
 
1427
        packet_set_connection(sock_in, sock_out, -1);
1423
1428
 
1424
1429
        remote_port = get_remote_port();
1425
1430
        remote_ip = get_remote_ipaddr();