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,
11 + static int washere = 0;
13 -#if ((defined(SVR4) || defined(__SVR4)) || \
14 - (defined(__NetBSD__) && defined(HAVE_UTMPX_H))) && \
15 - !(defined(LINUX) || defined(__hpux) || defined (_AIX))
16 - /* This "auxilliary" utmp doesn't exist under linux. */
23 - static int fdx = -1;
25 -#if !defined(WTMPX_FILE) && defined(_PATH_WTMPX)
26 -# define WTMPX_FILE _PATH_WTMPX
30 - (fdx = open(WTMPX_FILE, O_WRONLY|O_APPEND, 0)) < 0) {
31 - pr_log_pri(PR_LOG_WARNING, "wtmpx %s: %s", WTMPX_FILE, strerror(errno));
34 + utmpname(_PATH_WTMP);
38 /* Unfortunately, utmp string fields are terminated by '\0' if they are
40 * Insane if you ask me. Unless there's massive uproar, I prefer to err on
41 * the side of caution and always null-terminate our strings.
43 - if (fstat(fdx, &buf) == 0) {
44 - memset(&utx, 0, sizeof(utx));
46 - sstrncpy(utx.ut_user, name, sizeof(utx.ut_user));
47 - sstrncpy(utx.ut_id, "ftp", sizeof(utx.ut_user));
48 - sstrncpy(utx.ut_line, line, sizeof(utx.ut_line));
49 - sstrncpy(utx.ut_host, host, sizeof(utx.ut_host));
50 - utx.ut_pid = getpid();
51 -#if defined(__NetBSD__) && defined(HAVE_UTMPX_H)
52 - memcpy(&utx.ut_ss, pr_netaddr_get_inaddr(ip), sizeof(utx.ut_ss));
53 - gettimeofday(&utx.ut_tv, NULL);
55 - utx.ut_syslen = strlen(utx.ut_host)+1;
58 - utx.ut_tv.tv_sec = (time32_t)t;
60 - time(&utx.ut_tv.tv_sec);
65 - utx.ut_type = USER_PROCESS;
67 - utx.ut_type = DEAD_PROCESS;
68 -#ifdef HAVE_UT_UT_EXIT
69 - utx.ut_exit.e_termination = 0;
70 - utx.ut_exit.e_exit = 0;
71 -#endif /* HAVE_UT_UT_EXIT */
72 - if (write(fdx, (char *)&utx, sizeof(utx)) != sizeof(utx))
73 - ftruncate(fdx, buf.st_size);
76 - pr_log_debug(DEBUG0, "%s fstat(): %s", WTMPX_FILE, strerror(errno));
80 -#else /* Non-SVR4 systems */
83 - (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0) {
84 - pr_log_pri(PR_LOG_WARNING, "wtmp %s: %s", WTMP_FILE, strerror(errno));
88 - if (fstat(fd, &buf) == 0) {
89 memset(&ut, 0, sizeof(ut));
93 #endif /* HAVE_UT_UT_HOST */
96 - if (write(fd, (char *)&ut, sizeof(ut)) != sizeof(ut))
97 - ftruncate(fd, buf.st_size);
100 - pr_log_debug(DEBUG0, "%s fstat(): %s",WTMP_FILE,strerror(errno));
106 + while ((getutent())) ;