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 @@ | |||
74 | [session.c] | 74 | [session.c] |
75 | don't overwrite errno | 75 | don't overwrite errno |
76 | delay deletion of the xauth cookie | 76 | delay deletion of the xauth cookie |
77 | - markus@cvs.openbsd.org 2001/06/08 15:25:40 | ||
78 | [includes.h pathnames.h readconf.c servconf.c] | ||
79 | move the path for xauth to pathnames.h | ||
80 | |||
77 | 20010606 | 81 | 20010606 |
78 | - OpenBSD CVS Sync | 82 | - OpenBSD CVS Sync |
79 | - markus@cvs.openbsd.org 2001/05/17 21:34:15 | 83 | - markus@cvs.openbsd.org 2001/05/17 21:34:15 |
@@ -5584,4 +5588,4 @@ | |||
5584 | - Wrote replacements for strlcpy and mkdtemp | 5588 | - Wrote replacements for strlcpy and mkdtemp |
5585 | - Released 1.0pre1 | 5589 | - Released 1.0pre1 |
5586 | 5590 | ||
5587 | $Id: ChangeLog,v 1.1268 2001/06/09 01:44:07 mouring Exp $ | 5591 | $Id: ChangeLog,v 1.1269 2001/06/09 01:48:01 mouring Exp $ |
diff --git a/includes.h b/includes.h index 8b7bb0ed8..554e9476e 100644 --- a/includes.h +++ b/includes.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: includes.h,v 1.14 2001/01/29 01:58:16 niklas Exp $ */ | 1 | /* $OpenBSD: includes.h,v 1.15 2001/06/08 15:25:40 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
diff --git a/pathnames.h b/pathnames.h index 2f09820bd..190989655 100644 --- a/pathnames.h +++ b/pathnames.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pathnames.h,v 1.5 2001/04/12 19:15:24 markus Exp $ */ | 1 | /* $OpenBSD: pathnames.h,v 1.6 2001/06/08 15:25:40 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
diff --git a/readconf.c b/readconf.c index e9aa1818a..7ecbe96b7 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.79 2001/05/24 18:57:53 stevesk Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.80 2001/06/08 15:25:40 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -783,10 +783,10 @@ fill_default_options(Options * options) | |||
783 | options->forward_agent = 0; | 783 | options->forward_agent = 0; |
784 | if (options->forward_x11 == -1) | 784 | if (options->forward_x11 == -1) |
785 | options->forward_x11 = 0; | 785 | options->forward_x11 = 0; |
786 | #ifdef XAUTH_PATH | 786 | #ifdef _PATH_XAUTH |
787 | if (options->xauth_location == NULL) | 787 | if (options->xauth_location == NULL) |
788 | options->xauth_location = XAUTH_PATH; | 788 | options->xauth_location = _PATH_XAUTH; |
789 | #endif /* XAUTH_PATH */ | 789 | #endif |
790 | if (options->gateway_ports == -1) | 790 | if (options->gateway_ports == -1) |
791 | options->gateway_ports = 0; | 791 | options->gateway_ports = 0; |
792 | if (options->use_privileged_port == -1) | 792 | if (options->use_privileged_port == -1) |
diff --git a/servconf.c b/servconf.c index e357d77a4..d1205a81f 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: servconf.c,v 1.82 2001/05/20 17:20:35 markus Exp $"); | 13 | RCSID("$OpenBSD: servconf.c,v 1.83 2001/06/08 15:25:40 markus Exp $"); |
14 | 14 | ||
15 | #ifdef KRB4 | 15 | #ifdef KRB4 |
16 | #include <krb.h> | 16 | #include <krb.h> |
@@ -146,10 +146,10 @@ fill_default_server_options(ServerOptions *options) | |||
146 | options->x11_forwarding = 0; | 146 | options->x11_forwarding = 0; |
147 | if (options->x11_display_offset == -1) | 147 | if (options->x11_display_offset == -1) |
148 | options->x11_display_offset = 10; | 148 | options->x11_display_offset = 10; |
149 | #ifdef XAUTH_PATH | 149 | #ifdef _PATH_XAUTH |
150 | if (options->xauth_location == NULL) | 150 | if (options->xauth_location == NULL) |
151 | options->xauth_location = XAUTH_PATH; | 151 | options->xauth_location = _PATH_XAUTH; |
152 | #endif /* XAUTH_PATH */ | 152 | #endif |
153 | if (options->strict_modes == -1) | 153 | if (options->strict_modes == -1) |
154 | options->strict_modes = 1; | 154 | options->strict_modes = 1; |
155 | if (options->keepalives == -1) | 155 | if (options->keepalives == -1) |