Print this page
6057 login(1) "Last login" hostname is too short
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Reviewed by: Albert Lee <trisk@omniti.com>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Alex Wilson <alex.wilson@joyent.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/cmd/ssh/sshd/sshlogin.c
+++ new/usr/src/cmd/ssh/sshd/sshlogin.c
1 1 /*
2 2 * Author: Tatu Ylonen <ylo@cs.hut.fi>
3 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 4 * All rights reserved
5 5 * This file performs some of the things login(1) normally does. We cannot
6 6 * easily use something like login -p -h host -f user, because there are
7 7 * several different logins around, and it is hard to determined what kind of
8 8 * login the current system has. Also, we want to be able to execute commands
9 9 * on a tty.
10 10 *
11 11 * As far as I am concerned, the code I have written for this software
12 12 * can be used freely for any purpose. Any derived versions of this
13 13 * software must be clearly marked as such, and if the derived work is
14 14 * incompatible with the protocol description in the RFC file, it must be
15 15 * called by a name other than "ssh" or "Secure Shell".
16 16 *
17 17 * Copyright (c) 1999 Theo de Raadt. All rights reserved.
18 18 * Copyright (c) 1999 Markus Friedl. All rights reserved.
19 19 *
20 20 * Redistribution and use in source and binary forms, with or without
21 21 * modification, are permitted provided that the following conditions
22 22 * are met:
23 23 * 1. Redistributions of source code must retain the above copyright
24 24 * notice, this list of conditions and the following disclaimer.
25 25 * 2. Redistributions in binary form must reproduce the above copyright
26 26 * notice, this list of conditions and the following disclaimer in the
27 27 * documentation and/or other materials provided with the distribution.
28 28 *
29 29 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
30 30 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
31 31 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
32 32 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
33 33 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
34 34 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
35 35 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
36 36 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
37 37 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
38 38 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39 39 */
40 40 /*
41 41 * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
42 42 * Use is subject to license terms.
43 43 */
44 44
45 45 #include "includes.h"
46 46 RCSID("$OpenBSD: sshlogin.c,v 1.5 2002/08/29 15:57:25 stevesk Exp $");
47 47
48 48 #include "loginrec.h"
|
↓ open down ↓ |
48 lines elided |
↑ open up ↑ |
49 49 #include "log.h"
50 50 #include "buffer.h"
51 51 #include "servconf.h"
52 52 #include "canohost.h"
53 53 #include "packet.h"
54 54
55 55 extern u_int utmp_len;
56 56 extern ServerOptions options;
57 57
58 58 /*
59 - * Returns the time when the user last logged in. Returns 0 if the
60 - * information is not available. This must be called before record_login.
61 - * The host the user logged in from will be returned in buf.
62 - */
63 -u_long
64 -get_last_login_time(uid_t uid, const char *logname,
65 - char *buf, u_int bufsize)
66 -{
67 - struct logininfo li;
68 -
69 - (void) login_get_lastlog(&li, uid);
70 - (void) strlcpy(buf, li.hostname, bufsize);
71 - return li.tv_sec;
72 -}
73 -
74 -/*
75 59 * Records that the user has logged in. If only these parts of operating
76 60 * systems were more standardized.
77 61 */
78 62 void
79 63 record_login(pid_t pid, const char *ttyname, const char *progname,
80 64 const char *user)
81 65 {
82 66 struct logininfo *li;
83 67 static int initialized = 0;
84 68 static socklen_t fromlen;
85 69 static struct sockaddr_storage from;
86 70 static const char *remote_name_or_ip;
87 71
88 72 if (pid == 0)
89 73 pid = getpid();
90 74 /*
91 75 * Get IP address of client. If the connection is not a socket, let
92 76 * the address be 0.0.0.0.
93 77 */
94 78 if (!initialized) {
95 79 (void) memset(&from, 0, sizeof(from));
96 80 if (packet_connection_is_on_socket()) {
97 81 fromlen = sizeof(from);
98 82 if (getpeername(packet_get_connection_in(),
99 83 (struct sockaddr *) &from, &fromlen) < 0) {
100 84 debug("getpeername: %.100s", strerror(errno));
101 85 fatal_cleanup();
102 86 }
103 87 }
104 88 remote_name_or_ip = get_remote_name_or_ip(utmp_len,
105 89 options.verify_reverse_mapping);
106 90
107 91 initialized = 1;
108 92 }
109 93
110 94 li = login_alloc_entry(pid, user, remote_name_or_ip, ttyname, progname);
111 95 login_set_addr(li, (struct sockaddr*) &from, sizeof(struct sockaddr));
112 96 (void) login_login(li);
113 97 login_free_entry(li);
114 98 }
115 99
116 100 /* Records that the user has logged out. */
117 101 void
118 102 record_logout(pid_t pid, const char *ttyname, const char *progname,
119 103 const char *user)
120 104 {
121 105 struct logininfo *li;
122 106
123 107 li = login_alloc_entry(pid, user, NULL, ttyname, progname);
124 108 (void) login_logout(li);
125 109 login_free_entry(li);
126 110 }
|
↓ open down ↓ |
42 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX