1 --- proftpd-1.3.0/src/log.c 2005-11-14 18:33:06.000000000 +0200
2 +++ proftpd-1.3.0.utmp/src/log.c 2006-04-29 14:17:55.023163252 +0300
5 int log_wtmp(char *line, const char *name, const char *host,
12 -#if ((defined(SVR4) || defined(__SVR4)) || \
13 - (defined(__NetBSD__) && defined(HAVE_UTMPX_H))) && \
14 - !(defined(LINUX) || defined(__hpux) || defined (_AIX))
15 - /* This "auxilliary" utmp doesn't exist under linux. */
16 -#if defined(__sparcv9) && !defined(__NetBSD__)
22 - static int fdx = -1;
24 #if !defined(WTMPX_FILE) && defined(_PATH_WTMPX)
25 # define WTMPX_FILE _PATH_WTMPX
29 - (fdx = open(WTMPX_FILE, O_WRONLY|O_APPEND, 0)) < 0) {
30 - pr_log_pri(PR_LOG_WARNING, "wtmpx %s: %s", WTMPX_FILE, strerror(errno));
34 /* Unfortunately, utmp string fields are terminated by '\0' if they are
35 * shorter than the size of the field, but if they are exactly the size of
37 * Insane if you ask me. Unless there's massive uproar, I prefer to err on
38 * the side of caution and always null-terminate our strings.
40 - if (fstat(fdx, &buf) == 0) {
41 - memset(&utx, 0, sizeof(utx));
43 - sstrncpy(utx.ut_user, name, sizeof(utx.ut_user));
44 - sstrncpy(utx.ut_id, "ftp", sizeof(utx.ut_user));
45 - sstrncpy(utx.ut_line, line, sizeof(utx.ut_line));
46 - sstrncpy(utx.ut_host, host, sizeof(utx.ut_host));
47 - utx.ut_pid = getpid();
48 -#if defined(__NetBSD__) && defined(HAVE_UTMPX_H)
49 - memcpy(&utx.ut_ss, pr_netaddr_get_inaddr(ip), sizeof(utx.ut_ss));
50 - gettimeofday(&utx.ut_tv, NULL);
52 - utx.ut_syslen = strlen(utx.ut_host)+1;
55 - utx.ut_tv.tv_sec = (time32_t)t;
57 - time(&utx.ut_tv.tv_sec);
62 - utx.ut_type = USER_PROCESS;
64 - utx.ut_type = DEAD_PROCESS;
65 -#ifdef HAVE_UT_UT_EXIT
66 - utx.ut_exit.e_termination = 0;
67 - utx.ut_exit.e_exit = 0;
68 -#endif /* HAVE_UT_UT_EXIT */
69 - if (write(fdx, (char *)&utx, sizeof(utx)) != sizeof(utx))
70 - ftruncate(fdx, buf.st_size);
73 - pr_log_debug(DEBUG0, "%s fstat(): %s", WTMPX_FILE, strerror(errno));
77 -#else /* Non-SVR4 systems */
80 - (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0) {
81 - pr_log_pri(PR_LOG_WARNING, "wtmp %s: %s", WTMP_FILE, strerror(errno));
85 - if (fstat(fd, &buf) == 0) {
86 memset(&ut, 0, sizeof(ut));
90 #endif /* HAVE_UT_UT_HOST */
93 - if (write(fd, (char *)&ut, sizeof(ut)) != sizeof(ut))
94 - ftruncate(fd, buf.st_size);
97 - pr_log_debug(DEBUG0, "%s fstat(): %s",WTMP_FILE,strerror(errno));
102 + updwtmpx(WTMPX_FILE, &ut);