1 diff -ur proftpd-1.2.0rc2.orig/src/log.c proftpd-1.2.0rc2/src/log.c
2 --- proftpd-1.2.0rc2.orig/src/log.c Sat Sep 2 00:36:20 2000
3 +++ proftpd-1.2.0rc2/src/log.c Sat Sep 2 01:01:59 2000
6 int log_wtmp(char *line, char *name, char *host, p_in_addr_t *ip)
13 -#if (defined(SVR4) || defined(__SVR4)) && \
14 - !(defined(LINUX) || defined(__hpux) || defined (_AIX))
15 - /* This "auxilliary" utmp doesn't exist under linux. */
17 - static int fdx = -1;
19 - if(fdx < 0 && (fdx = open(WTMPX_FILE, O_WRONLY | O_APPEND, 0)) < 0) {
20 - log_pri(LOG_WARNING,"wtmpx %s: %s",WTMPX_FILE,strerror(errno));
23 + static int washere = 0;
26 + utmpname(_PATH_WTMP);
30 /* Unfortunately, utmp string fields are terminated by '\0' if they are
31 * shorter than the size of the field, but if they are exactly the size of
32 * the field they don't have to be terminated at all. Frankly, this sucks.
33 * Insane if you ask me. Unless there's massive uproar, I prefer to err on
34 * the side of caution and always null-terminate our strings.
36 - if(fstat(fdx,&buf) == 0) {
37 - memset(&utx,0,sizeof(utx));
38 - sstrncpy(utx.ut_user,name,sizeof(utx.ut_user));
39 - sstrncpy(utx.ut_id,"ftp",sizeof(utx.ut_user));
40 - sstrncpy(utx.ut_line,line,sizeof(utx.ut_line));
41 - sstrncpy(utx.ut_host,host,sizeof(utx.ut_host));
42 - utx.ut_syslen = strlen(utx.ut_host)+1;
43 - utx.ut_pid = getpid();
44 - time(&utx.ut_tv.tv_sec);
46 - utx.ut_type = USER_PROCESS;
48 - utx.ut_type = DEAD_PROCESS;
49 - utx.ut_exit.e_termination = 0;
50 - utx.ut_exit.e_exit = 0;
51 - if(write(fdx,(char*)&utx,sizeof(utx)) != sizeof(utx))
52 - ftruncate(fdx, buf.st_size);
54 - log_debug(DEBUG0,"%s fstat(): %s",WTMPX_FILE,strerror(errno));
58 -#else /* Non-SVR4 systems */
60 - if(fd < 0 && (fd = open(WTMP_FILE,O_WRONLY|O_APPEND,0)) < 0) {
61 - log_pri(LOG_WARNING,"wtmp %s: %s",WTMP_FILE,strerror(errno));
65 - if(fstat(fd,&buf) == 0) {
66 - memset(&ut,0,sizeof(ut));
67 + memset(&ut,0,sizeof(ut));
72 #endif /* HAVE_UT_UT_HOST */
75 - if(write(fd,(char*)&ut,sizeof(ut)) != sizeof(ut))
76 - ftruncate(fd,buf.st_size);
78 - log_debug(DEBUG0,"%s fstat(): %s",WTMP_FILE,strerror(errno));
84 + while ((getutent())) ;