diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-07-04 04:46:56 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-07-04 04:46:56 +0000 |
commit | 4cc240dabbd81a308f06f2717b1942041fe0e205 (patch) | |
tree | 07291c8c2c467fc2ecec9166ed0d8ec1e75631a3 /servconf.h | |
parent | 5bf5d67d497ed91c19851db6b904d54003afe67e (diff) |
- markus@cvs.openbsd.org 2001/06/26 17:27:25
[authfd.h authfile.h auth.h auth-options.h bufaux.h buffer.h
canohost.h channels.h cipher.h clientloop.h compat.h compress.h
crc32.h deattack.h dh.h dispatch.h groupaccess.c groupaccess.h
hostfile.h kex.h key.h log.c log.h mac.h misc.c misc.h mpaux.h
packet.h radix.h readconf.h readpass.h rsa.h servconf.h serverloop.h
session.h sftp-common.c sftp-common.h sftp-glob.h sftp-int.h
sshconnect.h ssh-dss.h sshlogin.h sshpty.h ssh-rsa.h sshtty.h
tildexpand.h uidswap.h uuencode.h xmalloc.h]
remove comments from .h, since they are cut&paste from the .c files
and out of sync
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/servconf.h b/servconf.h index 1b0220283..3552bb11a 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -11,7 +11,7 @@ | |||
11 | * called by a name other than "ssh" or "Secure Shell". | 11 | * called by a name other than "ssh" or "Secure Shell". |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /* RCSID("$OpenBSD: servconf.h,v 1.46 2001/06/26 16:15:24 dugsong Exp $"); */ | 14 | /* RCSID("$OpenBSD: servconf.h,v 1.47 2001/06/26 17:27:24 markus Exp $"); */ |
15 | 15 | ||
16 | #ifndef SERVCONF_H | 16 | #ifndef SERVCONF_H |
17 | #define SERVCONF_H | 17 | #define SERVCONF_H |
@@ -130,19 +130,9 @@ typedef struct { | |||
130 | char *authorized_keys_file2; /* File containing public SSH2 keys */ | 130 | char *authorized_keys_file2; /* File containing public SSH2 keys */ |
131 | int pam_authentication_via_kbd_int; | 131 | int pam_authentication_via_kbd_int; |
132 | } ServerOptions; | 132 | } ServerOptions; |
133 | /* | ||
134 | * Initializes the server options to special values that indicate that they | ||
135 | * have not yet been set. | ||
136 | */ | ||
137 | void initialize_server_options(ServerOptions *); | ||
138 | |||
139 | /* | ||
140 | * Reads the server configuration file. This only sets the values for those | ||
141 | * options that have the special value indicating they have not been set. | ||
142 | */ | ||
143 | void read_server_config(ServerOptions *, const char *); | ||
144 | 133 | ||
145 | /* Sets values for those values that have not yet been set. */ | 134 | void initialize_server_options(ServerOptions *); |
146 | void fill_default_server_options(ServerOptions *); | 135 | void read_server_config(ServerOptions *, const char *); |
136 | void fill_default_server_options(ServerOptions *); | ||
147 | 137 | ||
148 | #endif /* SERVCONF_H */ | 138 | #endif /* SERVCONF_H */ |