summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Steves <stevesk@pobox.com>2001-07-04 18:37:20 +0000
committerKevin Steves <stevesk@pobox.com>2001-07-04 18:37:20 +0000
commite468de65258b547cc113e822b9708d408aeb1310 (patch)
treefb48032b3fb9ded17df63a47d6cbd62f460bcde7
parent27fd19291af95ae39d705eee4975d40cfb47b3ec (diff)
- (stevesk) sync servconf.h (comments)
-rw-r--r--ChangeLog3
-rw-r--r--servconf.h6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b939819c7..5551ae13f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -134,6 +134,7 @@
134 - (bal) Makefile fix up requires scard.c 134 - (bal) Makefile fix up requires scard.c
135 - (stevesk) sync misc.h 135 - (stevesk) sync misc.h
136 - (stevesk) more sync for session.c 136 - (stevesk) more sync for session.c
137 - (stevesk) sync servconf.h (comments)
137 138
13820010629 13920010629
139 - (bal) Removed net_aton() since we don't use it any more 140 - (bal) Removed net_aton() since we don't use it any more
@@ -5961,4 +5962,4 @@
5961 - Wrote replacements for strlcpy and mkdtemp 5962 - Wrote replacements for strlcpy and mkdtemp
5962 - Released 1.0pre1 5963 - Released 1.0pre1
5963 5964
5964$Id: ChangeLog,v 1.1380 2001/07/04 18:23:03 stevesk Exp $ 5965$Id: ChangeLog,v 1.1381 2001/07/04 18:37:20 stevesk Exp $
diff --git a/servconf.h b/servconf.h
index 3552bb11a..55f2ee287 100644
--- a/servconf.h
+++ b/servconf.h
@@ -126,9 +126,11 @@ typedef struct {
126 * for this many intervals, above 126 * for this many intervals, above
127 * diconnect the session 127 * diconnect the session
128 */ 128 */
129 char *authorized_keys_file; /* File containing public RSA keys */ 129
130 char *authorized_keys_file2; /* File containing public SSH2 keys */ 130 char *authorized_keys_file; /* File containing public keys */
131 char *authorized_keys_file2;
131 int pam_authentication_via_kbd_int; 132 int pam_authentication_via_kbd_int;
133
132} ServerOptions; 134} ServerOptions;
133 135
134void initialize_server_options(ServerOptions *); 136void initialize_server_options(ServerOptions *);