- stevesk@cvs.openbsd.org 2002/01/04 17:59:17
[readconf.c servconf.c] remove #ifdef _PATH_XAUTH/#endif; ok markus@
This commit is contained in:
parent
56ccf41de2
commit
f51b0e1a30
|
@ -85,6 +85,9 @@
|
||||||
- stevesk@cvs.openbsd.org 2002/01/03 04:11:08
|
- stevesk@cvs.openbsd.org 2002/01/03 04:11:08
|
||||||
[ssh_config]
|
[ssh_config]
|
||||||
grammar in comment
|
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
|
20020121
|
||||||
|
@ -7233,4 +7236,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.1747 2002/01/22 12:18:32 djm Exp $
|
$Id: ChangeLog,v 1.1748 2002/01/22 12:18:49 djm Exp $
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#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 "ssh.h"
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
|
@ -815,10 +815,8 @@ fill_default_options(Options * options)
|
||||||
options->forward_agent = 0;
|
options->forward_agent = 0;
|
||||||
if (options->forward_x11 == -1)
|
if (options->forward_x11 == -1)
|
||||||
options->forward_x11 = 0;
|
options->forward_x11 = 0;
|
||||||
#ifdef _PATH_XAUTH
|
|
||||||
if (options->xauth_location == NULL)
|
if (options->xauth_location == NULL)
|
||||||
options->xauth_location = _PATH_XAUTH;
|
options->xauth_location = _PATH_XAUTH;
|
||||||
#endif
|
|
||||||
if (options->gateway_ports == -1)
|
if (options->gateway_ports == -1)
|
||||||
options->gateway_ports = 0;
|
options->gateway_ports = 0;
|
||||||
if (options->use_privileged_port == -1)
|
if (options->use_privileged_port == -1)
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#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)
|
#if defined(KRB4) || defined(KRB5)
|
||||||
#include <krb.h>
|
#include <krb.h>
|
||||||
|
@ -154,10 +154,8 @@ fill_default_server_options(ServerOptions *options)
|
||||||
options->x11_forwarding = 0;
|
options->x11_forwarding = 0;
|
||||||
if (options->x11_display_offset == -1)
|
if (options->x11_display_offset == -1)
|
||||||
options->x11_display_offset = 10;
|
options->x11_display_offset = 10;
|
||||||
#ifdef _PATH_XAUTH
|
|
||||||
if (options->xauth_location == NULL)
|
if (options->xauth_location == NULL)
|
||||||
options->xauth_location = _PATH_XAUTH;
|
options->xauth_location = _PATH_XAUTH;
|
||||||
#endif
|
|
||||||
if (options->strict_modes == -1)
|
if (options->strict_modes == -1)
|
||||||
options->strict_modes = 1;
|
options->strict_modes = 1;
|
||||||
if (options->keepalives == -1)
|
if (options->keepalives == -1)
|
||||||
|
|
Loading…
Reference in New Issue