]>
Commit | Line | Data |
---|---|---|
8db28cde PG |
1 | --- ./src/log.c.org Sun Oct 21 21:11:04 2001 |
2 | +++ ./src/log.c Sun Oct 21 21:20:07 2001 | |
3 | @@ -594,26 +594,16 @@ | |
12bef652 | 4 | |
8db28cde | 5 | int log_wtmp(char *line, char *name, char *host, p_in_addr_t *ip) |
728c4cc1 | 6 | { |
12bef652 JR |
7 | - struct stat buf; |
8 | struct utmp ut; | |
728c4cc1 JR |
9 | int res = 0; |
10 | - static int fd = -1; | |
8db28cde | 11 | |
12bef652 JR |
12 | -#if (defined(SVR4) || defined(__SVR4)) && \ |
13 | - !(defined(LINUX) || defined(__hpux) || defined (_AIX)) | |
ff5ecb89 | 14 | - /* This "auxilliary" utmp doesn't exist under linux. */ |
8db28cde PG |
15 | -#ifdef __sparcv9 |
16 | - struct futmpx utx; | |
17 | - time_t t; | |
18 | -#else | |
ff5ecb89 | 19 | - struct utmpx utx; |
8db28cde | 20 | -#endif |
12bef652 | 21 | - static int fdx = -1; |
8db28cde PG |
22 | + static int washere = 0; |
23 | ||
728c4cc1 JR |
24 | - if(fdx < 0 && (fdx = open(WTMPX_FILE, O_WRONLY | O_APPEND, 0)) < 0) { |
25 | - log_pri(LOG_WARNING,"wtmpx %s: %s",WTMPX_FILE,strerror(errno)); | |
26 | - return -1; | |
27 | - } | |
12bef652 JR |
28 | + if (!washere) { |
29 | + utmpname(_PATH_WTMP); | |
30 | + washere = 1; | |
31 | + } else | |
32 | + washere = 0; | |
8db28cde | 33 | |
12bef652 JR |
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 | |
8db28cde | 36 | @@ -621,42 +611,8 @@ |
12bef652 JR |
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. | |
39 | */ | |
728c4cc1 | 40 | - if(fstat(fdx,&buf) == 0) { |
ff5ecb89 JR |
41 | - memset(&utx,0,sizeof(utx)); |
42 | - sstrncpy(utx.ut_user,name,sizeof(utx.ut_user)); | |
43 | - sstrncpy(utx.ut_id,"ftp",sizeof(utx.ut_user)); | |
44 | - sstrncpy(utx.ut_line,line,sizeof(utx.ut_line)); | |
45 | - sstrncpy(utx.ut_host,host,sizeof(utx.ut_host)); | |
d5bd2d19 | 46 | - utx.ut_syslen = strlen(utx.ut_host)+1; |
ff5ecb89 | 47 | - utx.ut_pid = getpid(); |
8db28cde PG |
48 | -#ifdef __sparcv9 |
49 | - time(&t); | |
50 | - utx.ut_tv.tv_sec = (time32_t)t; | |
51 | -#else | |
ff5ecb89 | 52 | - time(&utx.ut_tv.tv_sec); |
8db28cde | 53 | -#endif |
ff5ecb89 JR |
54 | - if(*name) |
55 | - utx.ut_type = USER_PROCESS; | |
56 | - else | |
57 | - utx.ut_type = DEAD_PROCESS; | |
58 | - utx.ut_exit.e_termination = 0; | |
59 | - utx.ut_exit.e_exit = 0; | |
728c4cc1 JR |
60 | - if(write(fdx,(char*)&utx,sizeof(utx)) != sizeof(utx)) |
61 | - ftruncate(fdx, buf.st_size); | |
62 | - } else { | |
63 | - log_debug(DEBUG0,"%s fstat(): %s",WTMPX_FILE,strerror(errno)); | |
64 | - res = -1; | |
65 | - } | |
12bef652 JR |
66 | - |
67 | -#else /* Non-SVR4 systems */ | |
68 | - | |
728c4cc1 JR |
69 | - if(fd < 0 && (fd = open(WTMP_FILE,O_WRONLY|O_APPEND,0)) < 0) { |
70 | - log_pri(LOG_WARNING,"wtmp %s: %s",WTMP_FILE,strerror(errno)); | |
71 | - return -1; | |
72 | - } | |
12bef652 | 73 | - |
728c4cc1 | 74 | - if(fstat(fd,&buf) == 0) { |
ff5ecb89 | 75 | - memset(&ut,0,sizeof(ut)); |
8db28cde PG |
76 | + |
77 | + memset(&ut,0,sizeof(ut)); | |
728c4cc1 JR |
78 | #ifdef HAVE_UTMAXTYPE |
79 | #ifdef LINUX | |
8db28cde PG |
80 | if(ip) |
81 | @@ -686,13 +642,12 @@ | |
728c4cc1 JR |
82 | #endif /* HAVE_UT_UT_HOST */ |
83 | ||
12bef652 | 84 | time(&ut.ut_time); |
728c4cc1 JR |
85 | - if(write(fd,(char*)&ut,sizeof(ut)) != sizeof(ut)) |
86 | - ftruncate(fd,buf.st_size); | |
87 | - } else { | |
88 | - log_debug(DEBUG0,"%s fstat(): %s",WTMP_FILE,strerror(errno)); | |
89 | - res = -1; | |
12bef652 JR |
90 | - } |
91 | -#endif /* SVR4 */ | |
92 | + | |
93 | + setutent(); | |
94 | + while ((getutent())) ; | |
95 | + pututline(&ut); | |
96 | + if (!washere) | |
97 | + endutent(); | |
728c4cc1 JR |
98 | |
99 | return res; | |
12bef652 | 100 | } |