- stevesk@cvs.openbsd.org 2002/01/04 17:59:17

     [readconf.c servconf.c]
     remove #ifdef _PATH_XAUTH/#endif; ok markus@

diff --git a/ChangeLog b/ChangeLog
index fe1dcdb9c7e4f273052611faef5cab1e07c32ad5..a2ccaeabcfc0629be62e88a891c31547c28c3c62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -85,6 +85,9 @@
    - stevesk@cvs.openbsd.org 2002/01/03 04:11:08
      [ssh_config]
      grammar in comment
+   - stevesk@cvs.openbsd.org 2002/01/04 17:59:17
+     [readconf.c servconf.c]
+     remove #ifdef _PATH_XAUTH/#endif; ok markus@
 
 
 20020121

diff --git a/readconf.c b/readconf.c
index 6db96b978980fbb8ff2ea1f4e619c5d3dcf24d36..650a1199410137c69b6545bdbde5e61da31bd959 100644 (file)
--- a/readconf.c
+++ b/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"
@@ -815,10 +815,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/servconf.c b/servconf.c
index 76a80499d042549124387f18ddb2bfda54ee6ffc..e772cd46b5fac6084a2f01027c67352d98f4f6c9 100644 (file)
--- a/servconf.c
+++ b/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>
@@ -154,10 +154,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)