- 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

diff --git a/ChangeLog b/ChangeLog
index 6b361360b0657927f15b2dc4a1512450e363002b..bb8ed6cf536dc73abd261eed70797101f7c76a8a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 

diff --git a/includes.h b/includes.h
index 8b7bb0ed83120fd0fa900ff256b92ca52f89867a..554e9476e7308f3d51294cc2dff5bc2ad6dd6aca 100644 (file)
--- a/includes.h
+++ b/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>

diff --git a/pathnames.h b/pathnames.h
index 2f09820bdc558cde4fb4046778db09cb0ef37aca..19098965511f73dc873b6e357e5631598dca987a 100644 (file)
--- 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>

diff --git a/readconf.c b/readconf.c
index e9aa1818af2a9993b29374e26f06cc92e0d67aae..7ecbe96b7d4ca23f01e8192da2d6845ebacedc56 100644 (file)
--- 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)

diff --git a/servconf.c b/servconf.c
index e357d77a4b9b3ba92ea6d63ce98bd7564688ccf9..d1205a81f6ca3602406cd15b93b36ce0d77959cb 100644 (file)
--- a/servconf.c
+++ b/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>
@@ -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)