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

Return to readconf.c CVS log

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

version 1.280, 2017/10/21 23:06:24

version 1.281, 2017/12/05 23:59:47

Line 802

const struct multistate *multistate_ptr;

struct allowed_cname *cname;

glob_t gl;

const char *errstr;

if (activep == NULL) { /* We are processing a command line directive */

cmdline = 1;

Line 1116

Line 1117

intptr = &options->port;

parse_int:

arg = strdelim(&s);

if (!arg || *arg == '\0')

if ((errstr = atoi_err(arg, &value)) != NULL)

fatal("%.200s line %d: Missing argument.", filename, linenum);

fatal("%s line %d: integer value %s.",

if (arg[0] < '0' || arg[0] > '9')

filename, linenum, errstr);

fatal("%.200s line %d: Bad number.", filename, linenum);

/* Octal, decimal, or hex format? */

value = strtol(arg, &endofnumber, 0);

if (arg == endofnumber)

fatal("%.200s line %d: Bad number.", filename, linenum);

if (*activep && *intptr == -1)

*intptr = value;

break;

Line 1519

Line 1514

case oCanonicalDomains:

value = options->num_canonical_domains != 0;

while ((arg = strdelim(&s)) != NULL && *arg != '\0') {

const char *errstr;

if (!valid_domain(arg, 1, &errstr)) {

fatal("%s line %d: %s", filename, linenum,

errstr);