diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | includes.h | 2 | ||||
| -rw-r--r-- | pathnames.h | 2 | ||||
| -rw-r--r-- | readconf.c | 8 | ||||
| -rw-r--r-- | servconf.c | 8 |
5 files changed, 15 insertions, 11 deletions
@@ -74,6 +74,10 @@ [session.c] don't overwrite errno delay deletion of the xauth cookie + - 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 + 20010606 - OpenBSD CVS Sync - markus@cvs.openbsd.org 2001/05/17 21:34:15 @@ -5584,4 +5588,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1268 2001/06/09 01:44:07 mouring Exp $ +$Id: ChangeLog,v 1.1269 2001/06/09 01:48:01 mouring Exp $ @@ -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> diff --git a/pathnames.h b/pathnames.h index 2f09820b..19098965 100644 --- a/pathnames.h +++ b/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> @@ -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) @@ -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> @@ -146,10 +146,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) |