diff options
| author | kris <kris@FreeBSD.org> | 2000-05-15 05:24:25 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-05-15 05:24:25 +0000 |
| commit | a632b4789caf015f977f45e2d106cc00efa1239f (patch) | |
| tree | eb8a772c0dc7204d341277f265caa0c7c543c32c /crypto/openssh/login.c | |
| parent | 8cf8ce7bb13515db269566309a8e9cd8b309ee56 (diff) | |
| download | FreeBSD-src-a632b4789caf015f977f45e2d106cc00efa1239f.zip FreeBSD-src-a632b4789caf015f977f45e2d106cc00efa1239f.tar.gz | |
Resolve conflicts and update for FreeBSD.
Diffstat (limited to 'crypto/openssh/login.c')
| -rw-r--r-- | crypto/openssh/login.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/crypto/openssh/login.c b/crypto/openssh/login.c index 6bfba25..42a7af5 100644 --- a/crypto/openssh/login.c +++ b/crypto/openssh/login.c @@ -1,25 +1,25 @@ /* - * + * * login.c - * + * * Author: Tatu Ylonen <ylo@cs.hut.fi> - * + * * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved - * + * * Created: Fri Mar 24 14:51:08 1995 ylo - * + * * This file performs some of the things login(1) normally does. We cannot * easily use something like login -p -h host -f user, because there are * several different logins around, and it is hard to determined what kind of * login the current system has. Also, we want to be able to execute commands * on a tty. - * + * * $FreeBSD$ */ #include "includes.h" -RCSID("$Id: login.c,v 1.11 2000/01/04 00:07:59 markus Exp $"); +RCSID("$Id: login.c,v 1.13 2000/04/19 07:05:49 deraadt Exp $"); #ifdef __FreeBSD__ #include <libutil.h> @@ -40,7 +40,7 @@ RCSID("$Id: login.c,v 1.11 2000/01/04 00:07:59 markus Exp $"); * is found). The name of the host used last time is returned in buf. */ -unsigned long +unsigned long get_last_login_time(uid_t uid, const char *logname, char *buf, unsigned int bufsize) { @@ -72,8 +72,8 @@ get_last_login_time(uid_t uid, const char *logname, * were more standardized. */ -void -record_login(int pid, const char *ttyname, const char *user, uid_t uid, +void +record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid, const char *host, struct sockaddr * addr) { int fd; @@ -120,8 +120,8 @@ record_login(int pid, const char *ttyname, const char *user, uid_t uid, /* Records that the user has logged out. */ -void -record_logout(int pid, const char *ttyname) +void +record_logout(pid_t pid, const char *ttyname) { const char *line = ttyname + 5; /* /dev/ttyq8 -> ttyq8 */ if (logout(line)) |
