summaryrefslogtreecommitdiff
path: root/readconf.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 /readconf.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 'readconf.c')
-rw-r--r--readconf.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/readconf.c b/readconf.c
index 6db96b978..650a11994 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: readconf.c,v 1.93 2001/12/19 07:18:56 deraadt Exp $"); 15RCSID("$OpenBSD: readconf.c,v 1.94 2002/01/04 17:59:17 stevesk Exp $");
16 16
17#include "ssh.h" 17#include "ssh.h"
18#include "xmalloc.h" 18#include "xmalloc.h"
@@ -815,10 +815,8 @@ fill_default_options(Options * options)
815 options->forward_agent = 0; 815 options->forward_agent = 0;
816 if (options->forward_x11 == -1) 816 if (options->forward_x11 == -1)
817 options->forward_x11 = 0; 817 options->forward_x11 = 0;
818#ifdef _PATH_XAUTH
819 if (options->xauth_location == NULL) 818 if (options->xauth_location == NULL)
820 options->xauth_location = _PATH_XAUTH; 819 options->xauth_location = _PATH_XAUTH;
821#endif
822 if (options->gateway_ports == -1) 820 if (options->gateway_ports == -1)
823 options->gateway_ports = 0; 821 options->gateway_ports = 0;
824 if (options->use_privileged_port == -1) 822 if (options->use_privileged_port == -1)