- much cleaner and simpler

[packages/proftpd.git] / proftpd-wtmp.patch

--- proftpd-1.3.0/src/log.c	2005-11-14 18:33:06.000000000 +0200
+++ proftpd-1.3.0.utmp/src/log.c	2006-04-29 14:17:55.023163252 +0300
@@ -54,32 +54,12 @@
 
 int log_wtmp(char *line, const char *name, const char *host,
     pr_netaddr_t *ip) {
-  struct stat buf;
   struct utmp ut;
   int res = 0;
-  static int fd = -1;
-
-#if ((defined(SVR4) || defined(__SVR4)) || \
-    (defined(__NetBSD__) && defined(HAVE_UTMPX_H))) && \
-    !(defined(LINUX) || defined(__hpux) || defined (_AIX))
-  /* This "auxilliary" utmp doesn't exist under linux. */
-#if defined(__sparcv9) && !defined(__NetBSD__)
-  struct futmpx utx;
-  time_t t;
-#else
-  struct utmpx utx;
-#endif
-  static int fdx = -1;
 
 #if !defined(WTMPX_FILE) && defined(_PATH_WTMPX)
 # define WTMPX_FILE _PATH_WTMPX
 #endif
-
-  if (fdx < 0 &&
-      (fdx = open(WTMPX_FILE, O_WRONLY|O_APPEND, 0)) < 0) {
-    pr_log_pri(PR_LOG_WARNING, "wtmpx %s: %s", WTMPX_FILE, strerror(errno));
-    return -1;
-  }
 
   /* Unfortunately, utmp string fields are terminated by '\0' if they are
    * shorter than the size of the field, but if they are exactly the size of
@@ -87,52 +69,7 @@
    * Insane if you ask me.  Unless there's massive uproar, I prefer to err on
    * the side of caution and always null-terminate our strings.
    */
-  if (fstat(fdx, &buf) == 0) {
-    memset(&utx, 0, sizeof(utx));
-
-    sstrncpy(utx.ut_user, name, sizeof(utx.ut_user));
-    sstrncpy(utx.ut_id, "ftp", sizeof(utx.ut_user));
-    sstrncpy(utx.ut_line, line, sizeof(utx.ut_line));
-    sstrncpy(utx.ut_host, host, sizeof(utx.ut_host));
-    utx.ut_pid = getpid();
-#if defined(__NetBSD__) && defined(HAVE_UTMPX_H)
-    memcpy(&utx.ut_ss, pr_netaddr_get_inaddr(ip), sizeof(utx.ut_ss));
-    gettimeofday(&utx.ut_tv, NULL);
-#else /* SVR4 */
-    utx.ut_syslen = strlen(utx.ut_host)+1;
-#  ifdef __sparcv9
-    time(&t);
-    utx.ut_tv.tv_sec = (time32_t)t;
-#  else
-    time(&utx.ut_tv.tv_sec);
-#  endif
-#endif /* SVR4 */
-
-    if (*name)
-      utx.ut_type = USER_PROCESS;
-    else
-      utx.ut_type = DEAD_PROCESS;
-#ifdef HAVE_UT_UT_EXIT
-    utx.ut_exit.e_termination = 0;
-    utx.ut_exit.e_exit = 0;
-#endif /* HAVE_UT_UT_EXIT */
-    if (write(fdx, (char *)&utx, sizeof(utx)) != sizeof(utx))
-      ftruncate(fdx, buf.st_size);
-
-  } else {
-    pr_log_debug(DEBUG0, "%s fstat(): %s", WTMPX_FILE, strerror(errno));
-    res = -1;
-  }
-
-#else /* Non-SVR4 systems */
-
-  if (fd < 0 &&
-      (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0) {
-    pr_log_pri(PR_LOG_WARNING, "wtmp %s: %s", WTMP_FILE, strerror(errno));
-    return -1;
-  }
 
-  if (fstat(fd, &buf) == 0) {
     memset(&ut, 0, sizeof(ut));
 #ifdef HAVE_UTMAXTYPE
 # ifdef LINUX
@@ -169,15 +106,8 @@
 #endif /* HAVE_UT_UT_HOST */
 
     time(&ut.ut_time);
-    if (write(fd, (char *)&ut, sizeof(ut)) != sizeof(ut))
-      ftruncate(fd, buf.st_size);
-
-  } else {
-    pr_log_debug(DEBUG0, "%s fstat(): %s",WTMP_FILE,strerror(errno));
-    res = -1;
-  }
-#endif /* SVR4 */
 
+  updwtmpx(WTMPX_FILE, &ut);
   return res;
 }