=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth.c,v retrieving revision 1.46.2.2 retrieving revision 1.47 diff -u -r1.46.2.2 -r1.47 --- src/usr.bin/ssh/auth.c 2004/03/04 18:18:15 1.46.2.2 +++ src/usr.bin/ssh/auth.c 2003/04/08 20:21:28 1.47 @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth.c,v 1.46.2.2 2004/03/04 18:18:15 brad Exp $"); +RCSID("$OpenBSD: auth.c,v 1.47 2003/04/08 20:21:28 itojun Exp $"); #include @@ -91,7 +91,7 @@ } if (options.num_deny_users > 0 || options.num_allow_users > 0) { - hostname = get_canonical_hostname(options.use_dns); + hostname = get_canonical_hostname(options.verify_reverse_mapping); ipaddr = get_remote_ipaddr(); } @@ -153,6 +153,14 @@ return 1; } +Authctxt * +authctxt_new(void) +{ + Authctxt *authctxt = xmalloc(sizeof(*authctxt)); + memset(authctxt, 0, sizeof(*authctxt)); + return authctxt; +} + void auth_log(Authctxt *authctxt, int authenticated, char *method, char *info) { @@ -462,23 +470,4 @@ buffer_init(&auth_debug); auth_debug_init = 1; } -} - -struct passwd * -fakepw(void) -{ - static struct passwd fake; - - memset(&fake, 0, sizeof(fake)); - fake.pw_name = "NOUSER"; - fake.pw_passwd = - "$2a$06$r3.juUaHZDlIbQaO2dS9FuYxL1W9M81R1Tc92PoSNmzvpEqLkLGrK"; - fake.pw_gecos = "NOUSER"; - fake.pw_uid = -1; - fake.pw_gid = -1; - fake.pw_class = ""; - fake.pw_dir = "/nonexist"; - fake.pw_shell = "/nonexist"; - - return (&fake); }