summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-06-09 01:48:01 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-06-09 01:48:01 +0000
commit1bf11f6af7e284f6a7aa1b74a2c7d646cb54080b (patch)
treea0ed1e1460c878f7603e69b08c2148e59ea40e0c /readconf.c
parent4d3f22769985191bd9e79c557714c5eda971b652 (diff)
- markus@cvs.openbsd.org 2001/06/08 15:25:40
[includes.h pathnames.h readconf.c servconf.c] move the path for xauth to pathnames.h
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/readconf.c b/readconf.c
index e9aa1818..7ecbe96b 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.79 2001/05/24 18:57:53 stevesk Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.80 2001/06/08 15:25:40 markus Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -783,10 +783,10 @@ fill_default_options(Options * options)
options->forward_agent = 0;
if (options->forward_x11 == -1)
options->forward_x11 = 0;
-#ifdef XAUTH_PATH
+#ifdef _PATH_XAUTH
if (options->xauth_location == NULL)
- options->xauth_location = XAUTH_PATH;
-#endif /* XAUTH_PATH */
+ options->xauth_location = _PATH_XAUTH;
+#endif
if (options->gateway_ports == -1)
options->gateway_ports = 0;
if (options->use_privileged_port == -1)