diff options
author | Damien Miller <djm@mindrot.org> | 1999-11-25 11:54:57 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-11-25 11:54:57 +1100 |
commit | 5428f646ad32da88ddd04a8c287d595524674fbf (patch) | |
tree | cc1f1e5d7852e1f44d41077f776abf7dab7ac06d /servconf.h | |
parent | 9072e1889648988da38b7b81bce95291c1dc3a23 (diff) |
- More reformatting merged from OpenBSD CVS
- Merged OpenBSD CVS changes:
- [channels.c]
report from mrwizard@psu.edu via djm@ibs.com.au
- [channels.c]
set SO_REUSEADDR and SO_LINGER for forwarded ports.
chip@valinux.com via damien@ibs.com.au
- [nchan.c]
it's not an error() if shutdown_write failes in nchan.
- [readconf.c]
remove dead #ifdef-0-code
- [readconf.c servconf.c]
strcasecmp instead of tolower
- [scp.c]
progress meter overflow fix from damien@ibs.com.au
- [ssh-add.1 ssh-add.c]
SSH_ASKPASS support
- [ssh.1 ssh.c]
postpone fork_after_authentication until command execution,
request/patch from jahakala@cc.jyu.fi via damien@ibs.com.au
plus: use daemon() for backgrounding
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/servconf.h b/servconf.h index 4f3238e0c..e3ac5bdee 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -13,7 +13,7 @@ | |||
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
16 | /* RCSID("$Id: servconf.h,v 1.4 1999/11/24 13:26:22 damien Exp $"); */ | 16 | /* RCSID("$Id: servconf.h,v 1.5 1999/11/25 00:54:59 damien Exp $"); */ |
17 | 17 | ||
18 | #ifndef SERVCONF_H | 18 | #ifndef SERVCONF_H |
19 | #define SERVCONF_H | 19 | #define SERVCONF_H |
@@ -84,12 +84,16 @@ typedef struct { | |||
84 | unsigned int num_deny_groups; | 84 | unsigned int num_deny_groups; |
85 | char *deny_groups[MAX_DENY_GROUPS]; | 85 | char *deny_groups[MAX_DENY_GROUPS]; |
86 | } ServerOptions; | 86 | } ServerOptions; |
87 | /* Initializes the server options to special values that indicate that they | 87 | /* |
88 | have not yet been set. */ | 88 | * Initializes the server options to special values that indicate that they |
89 | * have not yet been set. | ||
90 | */ | ||
89 | void initialize_server_options(ServerOptions * options); | 91 | void initialize_server_options(ServerOptions * options); |
90 | 92 | ||
91 | /* Reads the server configuration file. This only sets the values for those | 93 | /* |
92 | options that have the special value indicating they have not been set. */ | 94 | * Reads the server configuration file. This only sets the values for those |
95 | * options that have the special value indicating they have not been set. | ||
96 | */ | ||
93 | void read_server_config(ServerOptions * options, const char *filename); | 97 | void read_server_config(ServerOptions * options, const char *filename); |
94 | 98 | ||
95 | /* Sets values for those values that have not yet been set. */ | 99 | /* Sets values for those values that have not yet been set. */ |