Deleted Added
sdiff udiff text old ( 133936 ) new ( 161764 )
full compact
logwtmp.c (133936) logwtmp.c (161764)
1/* $NetBSD: logwtmp.c,v 1.22 2004-08-09 12:56:48 lukem Exp $ */
1/* $NetBSD: logwtmp.c,v 1.24 2005/06/23 04:20:41 christos Exp $ */
2
3/*
4 * Copyright (c) 1988, 1993
5 * The Regents of the University of California. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:

--- 21 unchanged lines hidden (view full) ---

31 */
32
33
34#include <sys/cdefs.h>
35#ifndef lint
36#if 0
37static char sccsid[] = "@(#)logwtmp.c 8.1 (Berkeley) 6/4/93";
38#else
2
3/*
4 * Copyright (c) 1988, 1993
5 * The Regents of the University of California. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:

--- 21 unchanged lines hidden (view full) ---

31 */
32
33
34#include <sys/cdefs.h>
35#ifndef lint
36#if 0
37static char sccsid[] = "@(#)logwtmp.c 8.1 (Berkeley) 6/4/93";
38#else
39__RCSID("$NetBSD: logwtmp.c,v 1.22 2004-08-09 12:56:48 lukem Exp $");
39__RCSID("$NetBSD: logwtmp.c,v 1.24 2005/06/23 04:20:41 christos Exp $");
40#endif
41#endif /* not lint */
42
43#include <sys/types.h>
44#include <sys/param.h>
45#include <sys/time.h>
46#include <sys/stat.h>
47#include <sys/wait.h>
48
49#include <fcntl.h>
50#include <signal.h>
51#include <stdio.h>
52#include <string.h>
53#include <time.h>
40#endif
41#endif /* not lint */
42
43#include <sys/types.h>
44#include <sys/param.h>
45#include <sys/time.h>
46#include <sys/stat.h>
47#include <sys/wait.h>
48
49#include <fcntl.h>
50#include <signal.h>
51#include <stdio.h>
52#include <string.h>
53#include <time.h>
54#include <syslog.h>
54#include <unistd.h>
55#include <unistd.h>
56#ifdef SUPPORT_UTMP
55#include <utmp.h>
57#include <utmp.h>
58#endif
56#ifdef SUPPORT_UTMPX
57#include <utmpx.h>
58#endif
59#include <util.h>
60
61#ifdef KERBEROS5
62#include <krb5/krb5.h>
63#endif
64
65#include "extern.h"
66
59#ifdef SUPPORT_UTMPX
60#include <utmpx.h>
61#endif
62#include <util.h>
63
64#ifdef KERBEROS5
65#include <krb5/krb5.h>
66#endif
67
68#include "extern.h"
69
70#ifdef SUPPORT_UTMP
67static int fd = -1;
71static int fd = -1;
68#ifdef SUPPORT_UTMPX
69static int fdx = -1;
70#endif
71
72
73void
74ftpd_initwtmp(void)
75{
76 const char *wf = _PATH_WTMP;
77 if ((fd = open(wf, O_WRONLY|O_APPEND, 0)) == -1)
78 syslog(LOG_ERR, "Cannot open `%s' (%m)", wf);
79}
80
72/*
73 * Modified version of logwtmp that holds wtmp file open
74 * after first call, for use with ftp (which may chroot
75 * after login, but before logout).
76 */
77void
78ftpd_logwtmp(const char *line, const char *name, const char *host)
79{

--- 7 unchanged lines hidden (view full) ---

87 (void)strncpy(ut.ut_name, name, sizeof(ut.ut_name));
88 (void)strncpy(ut.ut_host, host, sizeof(ut.ut_host));
89 (void)time(&ut.ut_time);
90 if (write(fd, (char *)&ut, sizeof(struct utmp)) !=
91 sizeof(struct utmp))
92 (void)ftruncate(fd, buf.st_size);
93 }
94}
81/*
82 * Modified version of logwtmp that holds wtmp file open
83 * after first call, for use with ftp (which may chroot
84 * after login, but before logout).
85 */
86void
87ftpd_logwtmp(const char *line, const char *name, const char *host)
88{

--- 7 unchanged lines hidden (view full) ---

96 (void)strncpy(ut.ut_name, name, sizeof(ut.ut_name));
97 (void)strncpy(ut.ut_host, host, sizeof(ut.ut_host));
98 (void)time(&ut.ut_time);
99 if (write(fd, (char *)&ut, sizeof(struct utmp)) !=
100 sizeof(struct utmp))
101 (void)ftruncate(fd, buf.st_size);
102 }
103}
104#endif
95
96#ifdef SUPPORT_UTMPX
105
106#ifdef SUPPORT_UTMPX
107static int fdx = -1;
108
97void
109void
98ftpd_logwtmpx(const char *line, const char *name, const char *host, int status, int utx_type)
110ftpd_initwtmpx(void)
99{
111{
112 const char *wf = _PATH_WTMPX;
113 if ((fd = open(wf, O_WRONLY|O_APPEND, 0)) == -1)
114 syslog(LOG_ERR, "Cannot open `%s' (%m)", wf);
115}
116
117void
118ftpd_logwtmpx(const char *line, const char *name, const char *host,
119 struct sockinet *haddr, int status, int utx_type)
120{
100 struct utmpx ut;
101 struct stat buf;
102
121 struct utmpx ut;
122 struct stat buf;
123
103 if (fdx < 0 && (fdx = open(_PATH_WTMPX, O_WRONLY|O_APPEND, 0)) < 0)
124 if (fdx < 0)
104 return;
105 if (fstat(fdx, &buf) == 0) {
106 (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
107 (void)strncpy(ut.ut_name, name, sizeof(ut.ut_name));
108 (void)strncpy(ut.ut_host, host, sizeof(ut.ut_host));
125 return;
126 if (fstat(fdx, &buf) == 0) {
127 (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
128 (void)strncpy(ut.ut_name, name, sizeof(ut.ut_name));
129 (void)strncpy(ut.ut_host, host, sizeof(ut.ut_host));
130 if (haddr)
131 (void)memcpy(&ut.ut_ss, &haddr->si_su, haddr->su_len);
132 else
133 (void)memset(&ut.ut_ss, 0, sizeof(ut.ut_ss));
109 ut.ut_type = utx_type;
110 if (WIFEXITED(status))
111 ut.ut_exit.e_exit = (uint16_t)WEXITSTATUS(status);
112 if (WIFSIGNALED(status))
113 ut.ut_exit.e_termination = (uint16_t)WTERMSIG(status);
114 (void)gettimeofday(&ut.ut_tv, NULL);
115 if(write(fdx, (char *)&ut, sizeof(struct utmpx)) !=
116 sizeof(struct utmpx))
117 (void)ftruncate(fdx, buf.st_size);
118 }
119}
120#endif
134 ut.ut_type = utx_type;
135 if (WIFEXITED(status))
136 ut.ut_exit.e_exit = (uint16_t)WEXITSTATUS(status);
137 if (WIFSIGNALED(status))
138 ut.ut_exit.e_termination = (uint16_t)WTERMSIG(status);
139 (void)gettimeofday(&ut.ut_tv, NULL);
140 if(write(fdx, (char *)&ut, sizeof(struct utmpx)) !=
141 sizeof(struct utmpx))
142 (void)ftruncate(fdx, buf.st_size);
143 }
144}
145#endif