diff options
| author | des <des@FreeBSD.org> | 2003-04-23 17:13:13 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-04-23 17:13:13 +0000 |
| commit | 58b9db3b6f971290d3f183595398923fba625338 (patch) | |
| tree | fbb17bcf9ee0d969274a32106e1f15ae9a690fa3 /crypto/openssh/servconf.c | |
| parent | 6d34992e86f885f08b7df6e18a0b6af25ec2d664 (diff) | |
| download | FreeBSD-src-58b9db3b6f971290d3f183595398923fba625338.zip FreeBSD-src-58b9db3b6f971290d3f183595398923fba625338.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/servconf.c')
| -rw-r--r-- | crypto/openssh/servconf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index 0aa1101..fcb4809 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: servconf.c,v 1.115 2002/09/04 18:52:42 stevesk Exp $"); +RCSID("$OpenBSD: servconf.c,v 1.116 2003/02/21 09:05:53 markus Exp $"); RCSID("$FreeBSD$"); #if defined(KRB4) @@ -957,6 +957,7 @@ read_server_config(ServerOptions *options, const char *filename) char line[1024]; FILE *f; + debug2("read_server_config: filename %s", filename); f = fopen(filename, "r"); if (!f) { perror(filename); |
