diff options
| author | kris <kris@FreeBSD.org> | 2000-09-10 09:35:38 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-09-10 09:35:38 +0000 |
| commit | 24372e6c107e496b6909e6a488fe2303cef77299 (patch) | |
| tree | 3c5f04df23b54861f107ea20953c1aa478ade5f7 /crypto/openssh/auth1.c | |
| parent | 06ca4c9ec0ae64896cd4d42f586cdf3fa0c033ef (diff) | |
| download | FreeBSD-src-24372e6c107e496b6909e6a488fe2303cef77299.zip FreeBSD-src-24372e6c107e496b6909e6a488fe2303cef77299.tar.gz | |
Resolve conflicts and update for OpenSSH 2.2.0
Reviewed by: gshapiro, peter, green
Diffstat (limited to 'crypto/openssh/auth1.c')
| -rw-r--r-- | crypto/openssh/auth1.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/crypto/openssh/auth1.c b/crypto/openssh/auth1.c index 38e807f..cfeb0ca 100644 --- a/crypto/openssh/auth1.c +++ b/crypto/openssh/auth1.c @@ -2,11 +2,16 @@ * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved * - * $FreeBSD$ + * As far as I am concerned, the code I have written for this software + * can be used freely for any purpose. Any derived versions of this + * software must be clearly marked as such, and if the derived work is + * incompatible with the protocol description in the RFC file, it must be + * called by a name other than "ssh" or "Secure Shell". */ #include "includes.h" -RCSID("$OpenBSD: auth1.c,v 1.2 2000/04/29 18:11:52 markus Exp $"); +RCSID("$OpenBSD: auth1.c,v 1.4 2000/09/07 20:27:49 deraadt Exp $"); +RCSID("$FreeBSD$"); #include "xmalloc.h" #include "rsa.h" @@ -148,15 +153,15 @@ do_authloop(struct passwd * pw) unsigned int ulen; int type = 0; void (*authlog) (const char *fmt,...) = verbose; -#ifdef LOGIN_CAP +#ifdef HAVE_LOGIN_CAP login_cap_t *lc; -#endif /* LOGIN_CAP */ -#if defined(LOGIN_CAP) || defined(LOGIN_ACCESS) +#endif /* HAVE_LOGIN_CAP */ +#if defined(HAVE_LOGIN_CAP) || defined(LOGIN_ACCESS) const char *from_host, *from_ip; from_host = get_canonical_hostname(); from_ip = get_remote_ipaddr(); -#endif /* LOGIN_CAP || LOGIN_ACCESS */ +#endif /* HAVE_LOGIN_CAP || LOGIN_ACCESS */ #ifdef HAVE_LIBPAM int pam_retval; #endif /* HAVE_LIBPAM */ @@ -452,7 +457,7 @@ do_authloop(struct passwd * pw) } } -#ifdef LOGIN_CAP +#ifdef HAVE_LOGIN_CAP lc = login_getpwclass(pw); if (lc == NULL) lc = login_getclassbyname(NULL, pw); @@ -467,7 +472,7 @@ do_authloop(struct passwd * pw) packet_disconnect("Logins not available right now."); } login_close(lc); -#endif /* LOGIN_CAP */ +#endif /* HAVE_LOGIN_CAP */ #ifdef LOGIN_ACCESS if (!login_access(pw->pw_name, from_host)) { log("Denied connection for %.200s from %.200s [%.200s].", @@ -548,6 +553,7 @@ do_authentication() pwcopy.pw_passwd = xstrdup(pw->pw_passwd); pwcopy.pw_uid = pw->pw_uid; pwcopy.pw_gid = pw->pw_gid; + pwcopy.pw_class = xstrdup(pw->pw_class); pwcopy.pw_dir = xstrdup(pw->pw_dir); pwcopy.pw_shell = xstrdup(pw->pw_shell); pwcopy.pw_class = xstrdup(pw->pw_class); |
