diff options
| author | Kevin Steves <stevesk@cvs.openbsd.org> | 2002-01-04 17:59:18 +0000 |
|---|---|---|
| committer | Kevin Steves <stevesk@cvs.openbsd.org> | 2002-01-04 17:59:18 +0000 |
| commit | 88b19dc92239cefc63351005e35e470fbbeb4fb0 (patch) | |
| tree | ac5819cd029db5039973ffeb2182b1d2674f1a4a | |
| parent | c8559950f8f47f69f2124f115a4aba3ef6636eab (diff) | |
remove #ifdef _PATH_XAUTH/#endif; ok markus@
| -rw-r--r-- | usr.bin/ssh/readconf.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/servconf.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index 575abcfb710..5d15fd71b1b 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/readconf.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: readconf.c,v 1.93 2001/12/19 07:18:56 deraadt Exp $"); +RCSID("$OpenBSD: readconf.c,v 1.94 2002/01/04 17:59:17 stevesk Exp $"); #include "ssh.h" #include "xmalloc.h" @@ -813,10 +813,8 @@ fill_default_options(Options * options) options->forward_agent = 0; if (options->forward_x11 == -1) options->forward_x11 = 0; -#ifdef _PATH_XAUTH if (options->xauth_location == NULL) options->xauth_location = _PATH_XAUTH; -#endif if (options->gateway_ports == -1) options->gateway_ports = 0; if (options->use_privileged_port == -1) diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index 595ddbbeaec..5199199a16a 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/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> @@ -144,10 +144,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) |