diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-06-08 15:25:41 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-06-08 15:25:41 +0000 |
| commit | a58400f7d96462e1600047ac1eb72aebcebd145a (patch) | |
| tree | 736fff5ea052e041fac61f702f405a6bcfca5e5d | |
| parent | cd750a4e4d7c646f80fa6cf0bbc56cad0bc603af (diff) | |
move the path for xauth to pathnames.h
| -rw-r--r-- | usr.bin/ssh/includes.h | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/pathnames.h | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/readconf.c | 8 | ||||
| -rw-r--r-- | usr.bin/ssh/servconf.c | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/usr.bin/ssh/includes.h b/usr.bin/ssh/includes.h index 59258c2b0d4..9f98937165b 100644 --- a/usr.bin/ssh/includes.h +++ b/usr.bin/ssh/includes.h @@ -1,4 +1,4 @@ -/* $OpenBSD: includes.h,v 1.14 2001/01/29 01:58:16 niklas Exp $ */ +/* $OpenBSD: includes.h,v 1.15 2001/06/08 15:25:40 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -57,9 +57,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #include "version.h" -/* Define this to be the path of the xauth program. */ -#define XAUTH_PATH "/usr/X11R6/bin/xauth" - /* * Define this to use pipes instead of socketpairs for communicating with the * client program. Socketpairs do not seem to work on all systems. diff --git a/usr.bin/ssh/pathnames.h b/usr.bin/ssh/pathnames.h index 2f109b30ac4..064665a2e12 100644 --- a/usr.bin/ssh/pathnames.h +++ b/usr.bin/ssh/pathnames.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pathnames.h,v 1.5 2001/04/12 19:15:24 markus Exp $ */ +/* $OpenBSD: pathnames.h,v 1.6 2001/06/08 15:25:40 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -103,6 +103,9 @@ */ #define _PATH_SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass" +/* xauth for X11 forwarding */ +#define _PATH_XAUTH "/usr/X11R6/bin/xauth" + /* for scp */ #define _PATH_CP "cp" diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index da15aa5c10f..5271eda4d6a 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.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" @@ -781,10 +781,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) diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index 8033b0d19e2..953d6d51a18 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.82 2001/05/20 17:20:35 markus Exp $"); +RCSID("$OpenBSD: servconf.c,v 1.83 2001/06/08 15:25:40 markus Exp $"); #ifdef KRB4 #include <krb.h> @@ -145,10 +145,10 @@ fill_default_server_options(ServerOptions *options) options->x11_forwarding = 0; if (options->x11_display_offset == -1) options->x11_display_offset = 10; -#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->strict_modes == -1) options->strict_modes = 1; if (options->keepalives == -1) |