diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2015-04-29 03:48:56 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-04-29 18:20:32 +1000 |
commit | 531a57a3893f9fcd4aaaba8c312b612bbbcc021e (patch) | |
tree | 5fa3b241eaaf4e19653aee6b73926218a2f887e3 /servconf.h | |
parent | c1d5bcf1aaf1209af02f79e48ba1cbc76a87b56f (diff) |
upstream commit
Allow ListenAddress, Port and AddressFamily in any
order. bz#68, ok djm@, jmc@ (for the man page bit).
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/servconf.h b/servconf.h index 9922f0c8c..38520f476 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.h,v 1.116 2015/01/13 07:39:19 djm Exp $ */ | 1 | /* $OpenBSD: servconf.h,v 1.117 2015/04/29 03:48:56 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -58,7 +58,9 @@ typedef struct { | |||
58 | u_int num_ports; | 58 | u_int num_ports; |
59 | u_int ports_from_cmdline; | 59 | u_int ports_from_cmdline; |
60 | int ports[MAX_PORTS]; /* Port number to listen on. */ | 60 | int ports[MAX_PORTS]; /* Port number to listen on. */ |
61 | char *listen_addr; /* Address on which the server listens. */ | 61 | u_int num_queued_listens; |
62 | char **queued_listen_addrs; | ||
63 | int *queued_listen_ports; | ||
62 | struct addrinfo *listen_addrs; /* Addresses on which the server listens. */ | 64 | struct addrinfo *listen_addrs; /* Addresses on which the server listens. */ |
63 | int address_family; /* Address family used by the server. */ | 65 | int address_family; /* Address family used by the server. */ |
64 | char *host_key_files[MAX_HOSTKEYS]; /* Files containing host keys. */ | 66 | char *host_key_files[MAX_HOSTKEYS]; /* Files containing host keys. */ |