diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /servconf.h | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h index ebd056814..f7e56d521 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.h,v 1.70 2004/06/24 19:30:54 djm Exp $ */ | 1 | /* $OpenBSD: servconf.h,v 1.71 2004/12/23 23:11:00 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -43,6 +43,7 @@ typedef struct { | |||
43 | u_short ports[MAX_PORTS]; /* Port number to listen on. */ | 43 | u_short ports[MAX_PORTS]; /* Port number to listen on. */ |
44 | char *listen_addr; /* Address on which the server listens. */ | 44 | char *listen_addr; /* Address on which the server listens. */ |
45 | struct addrinfo *listen_addrs; /* Addresses on which the server listens. */ | 45 | struct addrinfo *listen_addrs; /* Addresses on which the server listens. */ |
46 | int address_family; /* Address family used by the server. */ | ||
46 | char *host_key_files[MAX_HOSTKEYS]; /* Files containing host keys. */ | 47 | char *host_key_files[MAX_HOSTKEYS]; /* Files containing host keys. */ |
47 | int num_host_key_files; /* Number of files for host keys. */ | 48 | int num_host_key_files; /* Number of files for host keys. */ |
48 | char *pid_file; /* Where to put our pid */ | 49 | char *pid_file; /* Where to put our pid */ |