src/usr.bin/ssh/readconf.c - diff

Return to readconf.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.54, 2001/01/18 16:20:22

version 1.55, 2001/01/19 15:55:11

Line 19

#include "match.h"

#include "xmalloc.h"

#include "compat.h"

#include "pathnames.h"

/* Format of the configuration file:

Line 780

Line 781

if (options->num_identity_files == 0) {

if (options->protocol & SSH_PROTO_1) {

options->identity_files[options->num_identity_files] =

xmalloc(2 + strlen(SSH_CLIENT_IDENTITY) + 1);

xmalloc(2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1);

sprintf(options->identity_files[options->num_identity_files++],

"~/%.100s", SSH_CLIENT_IDENTITY);

"~/%.100s", _PATH_SSH_CLIENT_IDENTITY);

}

if (options->protocol & SSH_PROTO_2) {

options->identity_files[options->num_identity_files] =

xmalloc(2 + strlen(SSH_CLIENT_ID_DSA) + 1);

xmalloc(2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1);

sprintf(options->identity_files[options->num_identity_files++],

"~/%.100s", SSH_CLIENT_ID_DSA);

"~/%.100s", _PATH_SSH_CLIENT_ID_DSA);

}

if (options->escape_char == -1)

options->escape_char = '~';

if (options->system_hostfile == NULL)

options->system_hostfile = SSH_SYSTEM_HOSTFILE;

options->system_hostfile = _PATH_SSH_SYSTEM_HOSTFILE;

if (options->user_hostfile == NULL)

options->user_hostfile = SSH_USER_HOSTFILE;

options->user_hostfile = _PATH_SSH_USER_HOSTFILE;

if (options->system_hostfile2 == NULL)

options->system_hostfile2 = SSH_SYSTEM_HOSTFILE2;

options->system_hostfile2 = _PATH_SSH_SYSTEM_HOSTFILE2;

if (options->user_hostfile2 == NULL)

options->user_hostfile2 = SSH_USER_HOSTFILE2;

options->user_hostfile2 = _PATH_SSH_USER_HOSTFILE2;

if (options->log_level == (LogLevel) - 1)

options->log_level = SYSLOG_LEVEL_INFO;

/* options->proxy_command should not be set by default */