Deleted Added
sdiff udiff text old ( 106130 ) new ( 113911 )
full compact
servconf.c (106130) servconf.c (113911)
1/*
2 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
3 * All rights reserved
4 *
5 * As far as I am concerned, the code I have written for this software
6 * can be used freely for any purpose. Any derived versions of this
7 * software must be clearly marked as such, and if the derived work is
8 * incompatible with the protocol description in the RFC file, it must be
9 * called by a name other than "ssh" or "Secure Shell".
10 */
11
12#include "includes.h"
1/*
2 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
3 * All rights reserved
4 *
5 * As far as I am concerned, the code I have written for this software
6 * can be used freely for any purpose. Any derived versions of this
7 * software must be clearly marked as such, and if the derived work is
8 * incompatible with the protocol description in the RFC file, it must be
9 * called by a name other than "ssh" or "Secure Shell".
10 */
11
12#include "includes.h"
13RCSID("$OpenBSD: servconf.c,v 1.115 2002/09/04 18:52:42 stevesk Exp $");
14RCSID("$FreeBSD: head/crypto/openssh/servconf.c 106130 2002-10-29 10:16:02Z des $");
13RCSID("$OpenBSD: servconf.c,v 1.116 2003/02/21 09:05:53 markus Exp $");
14RCSID("$FreeBSD: head/crypto/openssh/servconf.c 113911 2003-04-23 17:13:13Z des $");
15
16#if defined(KRB4)
17#include <krb.h>
18#endif
19#if defined(KRB5)
20#ifdef HEIMDAL
21#include <krb5.h>
22#else

--- 929 unchanged lines hidden (view full) ---

952
953void
954read_server_config(ServerOptions *options, const char *filename)
955{
956 int linenum, bad_options = 0;
957 char line[1024];
958 FILE *f;
959
15
16#if defined(KRB4)
17#include <krb.h>
18#endif
19#if defined(KRB5)
20#ifdef HEIMDAL
21#include <krb5.h>
22#else

--- 929 unchanged lines hidden (view full) ---

952
953void
954read_server_config(ServerOptions *options, const char *filename)
955{
956 int linenum, bad_options = 0;
957 char line[1024];
958 FILE *f;
959
960 debug2("read_server_config: filename %s", filename);
960 f = fopen(filename, "r");
961 if (!f) {
962 perror(filename);
963 exit(1);
964 }
965 linenum = 0;
966 while (fgets(line, sizeof(line), f)) {
967 /* Update line number counter. */
968 linenum++;
969 if (process_server_config_line(options, line, filename, linenum) != 0)
970 bad_options++;
971 }
972 fclose(f);
973 if (bad_options > 0)
974 fatal("%s: terminating, %d bad configuration options",
975 filename, bad_options);
976}
961 f = fopen(filename, "r");
962 if (!f) {
963 perror(filename);
964 exit(1);
965 }
966 linenum = 0;
967 while (fgets(line, sizeof(line), f)) {
968 /* Update line number counter. */
969 linenum++;
970 if (process_server_config_line(options, line, filename, linenum) != 0)
971 bad_options++;
972 }
973 fclose(f);
974 if (bad_options > 0)
975 fatal("%s: terminating, %d bad configuration options",
976 filename, bad_options);
977}