From 2ccf661cbe0924a1549a74b5a4f970e90f94d6a9 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 15 Nov 1999 15:25:10 +1100 Subject: - Merged more OpenBSD CVS changes: [auth-krb4.c] - disconnect if getpeername() fails - missing xfree(*client) [canohost.c] - disconnect if getpeername() fails - fix comment: we _do_ disconnect if ip-options are set [sshd.c] - disconnect if getpeername() fails - move checking of remote port to central place [auth-rhosts.c] move checking of remote port to central place [log-server.c] avoid extra fd per sshd, from millert@ [readconf.c] print _all_ bad config-options in ssh(1), too [readconf.h] print _all_ bad config-options in ssh(1), too [ssh.c] print _all_ bad config-options in ssh(1), too [sshconnect.c] disconnect if getpeername() fails - OpenBSD's changes to sshd.c broke the PAM stuff, re-merged it. --- readconf.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'readconf.h') diff --git a/readconf.h b/readconf.h index 8839a1bd..d2d387df 100644 --- a/readconf.h +++ b/readconf.h @@ -13,7 +13,7 @@ Functions for reading the configuration file. */ -/* RCSID("$Id: readconf.h,v 1.2 1999/11/11 06:57:39 damien Exp $"); */ +/* RCSID("$Id: readconf.h,v 1.3 1999/11/15 04:25:10 damien Exp $"); */ #ifndef READCONF_H #define READCONF_H @@ -92,8 +92,9 @@ void initialize_options(Options *options); void fill_default_options(Options *options); /* Processes a single option line as used in the configuration files. - This only sets those values that have not already been set. */ -void process_config_line(Options *options, const char *host, + This only sets those values that have not already been set. + Returns 0 for legal options */ +int process_config_line(Options *options, const char *host, char *line, const char *filename, int linenum, int *activep); -- cgit v1.2.3