… | |
… | |
12 | * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> |
12 | * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> |
13 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
13 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
14 | * - extensive modifications |
14 | * - extensive modifications |
15 | * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> |
15 | * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> |
16 | * - lastlog support |
16 | * - lastlog support |
17 | * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> |
17 | * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com> |
18 | * |
18 | * |
19 | * This program is free software; you can redistribute it and/or modify |
19 | * This program is free software; you can redistribute it and/or modify |
20 | * it under the terms of the GNU General Public License as published by |
20 | * it under the terms of the GNU General Public License as published by |
21 | * the Free Software Foundation; either version 2 of the License, or |
21 | * the Free Software Foundation; either version 2 of the License, or |
22 | * (at your option) any later version. |
22 | * (at your option) any later version. |
… | |
… | |
31 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
31 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
32 | *----------------------------------------------------------------------*/ |
32 | *----------------------------------------------------------------------*/ |
33 | |
33 | |
34 | #include "../config.h" |
34 | #include "../config.h" |
35 | #include "rxvt.h" |
35 | #include "rxvt.h" |
36 | #include "logging.h" |
36 | #include "ptytty.h" |
37 | |
37 | |
38 | #ifdef UTMP_SUPPORT |
38 | #if UTMP_SUPPORT |
39 | |
39 | |
40 | #if HAVE_STRUCT_UTMP |
40 | #if HAVE_STRUCT_UTMP |
41 | static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); |
41 | static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); |
42 | static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); |
42 | static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); |
43 | #endif |
43 | #endif |
… | |
… | |
55 | |
55 | |
56 | /* |
56 | /* |
57 | * make and write utmp and wtmp entries |
57 | * make and write utmp and wtmp entries |
58 | */ |
58 | */ |
59 | void |
59 | void |
60 | rxvt_session::login (const char *pty, int cmd_pid, bool login_shell, const char *hostname) |
60 | rxvt_ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname) |
61 | { |
61 | { |
|
|
62 | const char *pty = name; |
|
|
63 | |
|
|
64 | if (!pty || !*pty) |
|
|
65 | return; |
|
|
66 | |
62 | this->cmd_pid = cmd_pid; |
67 | this->cmd_pid = cmd_pid; |
63 | this->login_shell = login_shell; |
68 | this->login_shell = login_shell; |
64 | |
69 | |
65 | #ifdef HAVE_STRUCT_UTMP |
70 | #ifdef HAVE_STRUCT_UTMP |
66 | struct utmp *ut = &this->ut; |
71 | struct utmp *ut = &this->ut; |
… | |
… | |
158 | endutxent (); /* close the file */ |
163 | endutxent (); /* close the file */ |
159 | utmp_pos = 0; |
164 | utmp_pos = 0; |
160 | #endif |
165 | #endif |
161 | |
166 | |
162 | #if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) |
167 | #if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) |
163 | |
|
|
164 | { |
168 | { |
165 | # ifdef HAVE_TTYSLOT |
169 | # ifdef HAVE_TTYSLOT |
|
|
170 | int fdstdin = dup (STDIN_FILENO); |
|
|
171 | dup2 (tty, STDIN_FILENO); |
|
|
172 | |
166 | i = ttyslot (); |
173 | i = ttyslot (); |
167 | if (rxvt_write_bsd_utmp (i, ut)) |
174 | if (rxvt_write_bsd_utmp (i, ut)) |
168 | utmp_pos = i; |
175 | utmp_pos = i; |
|
|
176 | |
|
|
177 | dup2 (fdstdin, STDIN_FILENO); |
|
|
178 | close (fdstdin); |
169 | # else |
179 | # else |
170 | FILE *fd0; |
180 | FILE *fd0; |
171 | |
181 | |
172 | if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) |
182 | if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) |
173 | { |
183 | { |
174 | char buf[256], name[256]; |
184 | char buf[256], name[256]; |
175 | |
185 | |
… | |
… | |
193 | # endif |
203 | # endif |
194 | } |
204 | } |
195 | #endif |
205 | #endif |
196 | |
206 | |
197 | #ifdef WTMP_SUPPORT |
207 | #ifdef WTMP_SUPPORT |
198 | # ifdef WTMP_ONLY_ON_LOGIN |
208 | #ifdef LOG_ONLY_ON_LOGIN |
199 | if (login_shell) |
209 | if (login_shell) |
200 | # endif |
210 | #endif |
201 | { |
211 | { |
202 | # ifdef HAVE_STRUCT_UTMP |
212 | # ifdef HAVE_STRUCT_UTMP |
203 | # ifdef HAVE_UPDWTMP |
213 | # ifdef HAVE_UPDWTMP |
204 | updwtmp (RXVT_WTMP_FILE, ut); |
214 | updwtmp (RXVT_WTMP_FILE, ut); |
205 | # else |
215 | # else |
… | |
… | |
210 | updwtmpx (RXVT_WTMPX_FILE, utx); |
220 | updwtmpx (RXVT_WTMPX_FILE, utx); |
211 | # endif |
221 | # endif |
212 | } |
222 | } |
213 | #endif |
223 | #endif |
214 | #if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) |
224 | #if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) |
|
|
225 | #ifdef LOG_ONLY_ON_LOGIN |
215 | if (login_shell) |
226 | if (login_shell) |
|
|
227 | #endif |
216 | rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); |
228 | rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); |
217 | #endif |
229 | #endif |
218 | } |
230 | } |
219 | |
231 | |
220 | /* ------------------------------------------------------------------------- */ |
232 | /* ------------------------------------------------------------------------- */ |
221 | /* |
233 | /* |
222 | * remove utmp and wtmp entries |
234 | * remove utmp and wtmp entries |
223 | */ |
235 | */ |
224 | void |
236 | void |
225 | rxvt_session::logout () |
237 | rxvt_ptytty_unix::logout () |
226 | { |
238 | { |
|
|
239 | if (!cmd_pid) |
|
|
240 | return; |
|
|
241 | |
227 | #ifdef HAVE_STRUCT_UTMP |
242 | #ifdef HAVE_STRUCT_UTMP |
228 | struct utmp *tmput, *ut = &this->ut; |
243 | struct utmp *tmput, *ut = &this->ut; |
229 | #endif |
244 | #endif |
230 | #ifdef HAVE_STRUCT_UTMPX |
245 | #ifdef HAVE_STRUCT_UTMPX |
231 | struct utmpx *tmputx, *utx = &this->utx; |
246 | struct utmpx *tmputx, *utx = &this->utx; |
… | |
… | |
266 | |
281 | |
267 | /* |
282 | /* |
268 | * Write ending wtmp entry |
283 | * Write ending wtmp entry |
269 | */ |
284 | */ |
270 | #ifdef WTMP_SUPPORT |
285 | #ifdef WTMP_SUPPORT |
271 | # ifdef WTMP_ONLY_ON_LOGIN |
286 | #ifdef LOG_ONLY_ON_LOGIN |
272 | if (login_shell) |
287 | if (login_shell) |
273 | # endif |
288 | #endif |
274 | { |
289 | { |
275 | # ifdef HAVE_STRUCT_UTMP |
290 | # ifdef HAVE_STRUCT_UTMP |
276 | # ifdef HAVE_UPDWTMP |
291 | # ifdef HAVE_UPDWTMP |
277 | updwtmp (RXVT_WTMP_FILE, ut); |
292 | updwtmp (RXVT_WTMP_FILE, ut); |
278 | # else |
293 | # else |
… | |
… | |
301 | #ifdef HAVE_STRUCT_UTMPX |
316 | #ifdef HAVE_STRUCT_UTMPX |
302 | if (utx->ut_pid == cmd_pid) |
317 | if (utx->ut_pid == cmd_pid) |
303 | pututxline (utx); |
318 | pututxline (utx); |
304 | endutxent (); |
319 | endutxent (); |
305 | #endif |
320 | #endif |
|
|
321 | |
|
|
322 | cmd_pid = 0; |
306 | } |
323 | } |
307 | |
324 | |
308 | /* ------------------------------------------------------------------------- */ |
325 | /* ------------------------------------------------------------------------- */ |
309 | /* |
326 | /* |
310 | * Write a BSD style utmp entry |
327 | * Write a BSD style utmp entry |