diff options
author | Damien Miller <djm@mindrot.org> | 2002-01-22 23:18:49 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-01-22 23:18:49 +1100 |
commit | f51b0e1a3017bbd5ea06358e6e539bd71bfa65c8 (patch) | |
tree | 1cc0674d90e8352ddb3bb6cce4f7c0b186d181ac /servconf.c | |
parent | 56ccf41de20249d84a67dc17b74e71e10fac8b3e (diff) |
- stevesk@cvs.openbsd.org 2002/01/04 17:59:17
[readconf.c servconf.c]
remove #ifdef _PATH_XAUTH/#endif; ok markus@
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/servconf.c b/servconf.c index 76a80499d..e772cd46b 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: servconf.c,v 1.95 2001/12/19 07:18:56 deraadt Exp $"); | 13 | RCSID("$OpenBSD: servconf.c,v 1.96 2002/01/04 17:59:17 stevesk Exp $"); |
14 | 14 | ||
15 | #if defined(KRB4) || defined(KRB5) | 15 | #if defined(KRB4) || defined(KRB5) |
16 | #include <krb.h> | 16 | #include <krb.h> |
@@ -154,10 +154,8 @@ fill_default_server_options(ServerOptions *options) | |||
154 | options->x11_forwarding = 0; | 154 | options->x11_forwarding = 0; |
155 | if (options->x11_display_offset == -1) | 155 | if (options->x11_display_offset == -1) |
156 | options->x11_display_offset = 10; | 156 | options->x11_display_offset = 10; |
157 | #ifdef _PATH_XAUTH | ||
158 | if (options->xauth_location == NULL) | 157 | if (options->xauth_location == NULL) |
159 | options->xauth_location = _PATH_XAUTH; | 158 | options->xauth_location = _PATH_XAUTH; |
160 | #endif | ||
161 | if (options->strict_modes == -1) | 159 | if (options->strict_modes == -1) |
162 | options->strict_modes = 1; | 160 | options->strict_modes = 1; |
163 | if (options->keepalives == -1) | 161 | if (options->keepalives == -1) |