diff options
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.369 2010/01/09 11:17:56 dtucker Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.370 2010/01/09 23:04:13 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -961,8 +961,8 @@ server_listen(void) | |||
961 | continue; | 961 | continue; |
962 | } | 962 | } |
963 | /* Create socket for listening. */ | 963 | /* Create socket for listening. */ |
964 | listen_sock = socket_rdomain(ai->ai_family, ai->ai_socktype, | 964 | listen_sock = socket(ai->ai_family, ai->ai_socktype, |
965 | ai->ai_protocol, options.rdomain); | 965 | ai->ai_protocol); |
966 | if (listen_sock < 0) { | 966 | if (listen_sock < 0) { |
967 | /* kernel may not support ipv6 */ | 967 | /* kernel may not support ipv6 */ |
968 | verbose("socket: %.100s", strerror(errno)); | 968 | verbose("socket: %.100s", strerror(errno)); |
@@ -1470,9 +1470,8 @@ main(int ac, char **av) | |||
1470 | if (options.challenge_response_authentication) | 1470 | if (options.challenge_response_authentication) |
1471 | options.kbd_interactive_authentication = 1; | 1471 | options.kbd_interactive_authentication = 1; |
1472 | 1472 | ||
1473 | /* set default channel AF and routing domain */ | 1473 | /* set default channel AF */ |
1474 | channel_set_af(options.address_family); | 1474 | channel_set_af(options.address_family); |
1475 | channel_set_rdomain(options.rdomain); | ||
1476 | 1475 | ||
1477 | /* Check that there are no remaining arguments. */ | 1476 | /* Check that there are no remaining arguments. */ |
1478 | if (optind < ac) { | 1477 | if (optind < ac) { |