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

Return to auth.c CVS log

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

Diff for /src/usr.bin/ssh/auth.c between version 1.60.2.1 and 1.61

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

version 1.61, 2006/02/08 12:15:27

Line 1

/* $OpenBSD$ */

Line 23

Line 22

* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include <sys/types.h>

#include "includes.h"

#include <sys/stat.h>

RCSID("$OpenBSD$");

#include <sys/param.h>

#include <errno.h>

#include <libgen.h>

#include <paths.h>

#include <pwd.h>

#include <stdarg.h>

#include <stdio.h>

#include <string.h>

#include "xmalloc.h"

#include "match.h"

#include "groupaccess.h"

#include "log.h"

#include "buffer.h"

#include "servconf.h"

#include "key.h"

#include "hostfile.h"

#include "auth.h"

#include "auth-options.h"

#include "canohost.h"

#include "buffer.h"

#include "bufaux.h"

#include "uidswap.h"

#include "misc.h"

#include "bufaux.h"

#include "packet.h"

#ifdef GSSAPI

#include "ssh-gss.h"

#endif

#include "monitor_wrap.h"

/* import */

extern ServerOptions options;

extern int use_privsep;

/* Debugging messages */

Buffer auth_debug;

Line 175

Line 163

void (*authlog) (const char *fmt,...) = verbose;

char *authmsg;

if (use_privsep && !mm_is_monitor() && !authctxt->postponed)

return;

/* Raise logging level */

if (authenticated == 1 ||

!authctxt->valid ||

Line 209

Line 194

switch (options.permit_root_login) {

case PERMIT_YES:

return 1;

break;

case PERMIT_NO_PASSWD:

if (strcmp(method, "password") != 0)

return 1;

Line 235

Line 221

static char *

expand_authorized_keys(const char *filename, struct passwd *pw)

{

char *file, ret[MAXPATHLEN];

char *file, *ret;

int i;

file = percent_expand(filename, "h", pw->pw_dir,

"u", pw->pw_name, (char *)NULL);

Line 248

Line 233

if (*file == '/')

return (file);

i = snprintf(ret, sizeof(ret), "%s/%s", pw->pw_dir, file);

ret = xmalloc(MAXPATHLEN);

if (i < 0 || (size_t)i >= sizeof(ret))

if (strlcpy(ret, pw->pw_dir, MAXPATHLEN) >= MAXPATHLEN ||

strlcat(ret, "/", MAXPATHLEN) >= MAXPATHLEN ||

strlcat(ret, file, MAXPATHLEN) >= MAXPATHLEN)

fatal("expand_authorized_keys: path too long");

xfree(file);

return (xstrdup(ret));

return (ret);

}

char *

Line 388

Line 376

#endif

struct passwd *pw;

parse_server_match_config(&options, user,

get_canonical_hostname(options.use_dns), get_remote_ipaddr());

pw = getpwnam(user);

if (pw == NULL) {