- djm@cvs.openbsd.org 2010/01/09 00:20:26

[openssh.git] / sshd.c

diff --git a/sshd.c b/sshd.c
index 04d8f9fa090d03fe74793d393472531d0d3c63c3..e23d462eebb193b63471a442437fe7e848bb5a8b 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.367 2009/05/28 16:50:16 andreas Exp $ */
+/* $OpenBSD: sshd.c,v 1.368 2009/10/28 16:38:18 reyk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -960,8 +960,8 @@ server_listen(void)
                        continue;
                }
                /* Create socket for listening. */
-               listen_sock = socket(ai->ai_family, ai->ai_socktype,
-                   ai->ai_protocol);
+               listen_sock = socket_rdomain(ai->ai_family, ai->ai_socktype,
+                   ai->ai_protocol, options.rdomain);
                if (listen_sock < 0) {
                        /* kernel may not support ipv6 */
                        verbose("socket: %.100s", strerror(errno));
@@ -1469,8 +1469,9 @@ main(int ac, char **av)
        if (options.challenge_response_authentication)
                options.kbd_interactive_authentication = 1;
 
-       /* set default channel AF */
+       /* set default channel AF and routing domain */
        channel_set_af(options.address_family);
+       channel_set_rdomain(options.rdomain);
 
        /* Check that there are no remaining arguments. */
        if (optind < ac) {
@@ -1656,6 +1657,7 @@ main(int ac, char **av)
        if (inetd_flag) {
                server_accept_inetd(&sock_in, &sock_out);
        } else {
+               platform_pre_listen();
                server_listen();
 
                if (options.protocol & SSH_PROTO_1)