summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:18:49 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:18:49 +1100
commitf51b0e1a3017bbd5ea06358e6e539bd71bfa65c8 (patch)
tree1cc0674d90e8352ddb3bb6cce4f7c0b186d181ac /servconf.c
parent56ccf41de20249d84a67dc17b74e71e10fac8b3e (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.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/servconf.c b/servconf.c
index 76a80499..e772cd46 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.95 2001/12/19 07:18:56 deraadt Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.96 2002/01/04 17:59:17 stevesk Exp $");
#if defined(KRB4) || defined(KRB5)
#include <krb.h>
@@ -154,10 +154,8 @@ fill_default_server_options(ServerOptions *options)
options->x11_forwarding = 0;
if (options->x11_display_offset == -1)
options->x11_display_offset = 10;
-#ifdef _PATH_XAUTH
if (options->xauth_location == NULL)
options->xauth_location = _PATH_XAUTH;
-#endif
if (options->strict_modes == -1)
options->strict_modes = 1;
if (options->keepalives == -1)