src/usr.bin/ssh/auth-options.c - diff

Return to auth-options.c CVS log

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

Diff for /src/usr.bin/ssh/auth-options.c between version 1.31.4.2 and 1.32

version 1.31.4.2, 2006/10/06 03:19:32

version 1.32, 2005/12/06 22:38:27

Line 1

/* $OpenBSD$ */

* Author: Tatu Ylonen <ylo@cs.hut.fi>

Line 10

Line 9

* called by a name other than "ssh" or "Secure Shell".

#include <sys/types.h>

#include "includes.h"

RCSID("$OpenBSD$");

#include <netdb.h>

#include <pwd.h>

#include <string.h>

#include <stdio.h>

#include <stdarg.h>

#include "xmalloc.h"

#include "match.h"

#include "log.h"

#include "canohost.h"

#include "buffer.h"

#include "channels.h"

#include "auth-options.h"

#include "servconf.h"

#include "misc.h"

#include "key.h"

#include "hostfile.h"

#include "auth.h"

#ifdef GSSAPI

#include "ssh-gss.h"

#endif

#include "monitor_wrap.h"

#include "auth.h"

/* Flags set authorized_keys flags */

int no_port_forwarding_flag = 0;

Line 143

Line 131

forced_command = NULL;

goto bad_option;

}

forced_command[i] = '\0';

forced_command[i] = 0;

auth_debug_add("Forced command: %.900s", forced_command);

opts++;

goto next_option;

Line 175

Line 163

xfree(s);

goto bad_option;

}

s[i] = '\0';

s[i] = 0;

auth_debug_add("Adding to environment: %.900s", s);

debug("Adding to environment: %.900s", s);

opts++;

Line 212

Line 200

xfree(patterns);

goto bad_option;

}

patterns[i] = '\0';

patterns[i] = 0;

opts++;

if (match_host_and_ip(remote_host, remote_ip,

patterns) != 1) {

Line 257

Line 245

xfree(patterns);

goto bad_option;

}

patterns[i] = '\0';

patterns[i] = 0;

opts++;

p = patterns;

host = hpdelim(&p);

Line 305

Line 293

forced_tun_device = -1;

goto bad_option;

}

tun[i] = '\0';

tun[i] = 0;

forced_tun_device = a2tun(tun, NULL);

xfree(tun);

if (forced_tun_device == SSH_TUNID_ERR) {

if (forced_tun_device < -1) {

debug("%.100s, line %lu: invalid tun device",

file, linenum);

auth_debug_add("%.100s, line %lu: invalid tun device",