pam segfaults fix

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

diff --git a/proftpd-wtmp.patch b/proftpd-wtmp.patch
index cbc3917ba84fc75699f96894825a7e9684879833..f223c0488d1a245d808ae5046b74114035fed11f 100644 (file)
--- a/proftpd-wtmp.patch
+++ b/proftpd-wtmp.patch
@@ -1,80 +1,74 @@
 diff -ur proftpd-1.2.0rc2.orig/src/log.c proftpd-1.2.0rc2/src/log.c
---- proftpd-1.2.0rc2.orig/src/log.c    Wed Jul 26 13:03:17 2000
-+++ proftpd-1.2.0rc2/src/log.c Wed Aug  9 17:14:50 2000
-@@ -31,6 +31,9 @@
-  *   Also added a command line argument (-d,--debug) to alter the
-  *   debug level at runtime.  See main.c.
-  */
-+#ifdef LINUX
-+#define __USE_GNU
-+#endif
- 
- #include "conf.h"
- 
-@@ -529,21 +532,11 @@
+--- proftpd-1.2.0rc2.orig/src/log.c    Sat Sep  2 00:36:20 2000
++++ proftpd-1.2.0rc2/src/log.c Sat Sep  2 01:01:59 2000
+@@ -530,59 +530,22 @@
  
  int log_wtmp(char *line, char *name, char *host, p_in_addr_t *ip)
  {
 -  struct stat buf;
--  struct utmp ut;
+   struct utmp ut;
    int res = 0;
 -  static int fd = -1;
- 
--#if defined(SVR4) || defined(__SVR4)
--#if !(defined(LINUX) || defined(__hpux) || defined (_AIX))
-+#ifdef HAVE_UTMPX_H
-   /* This "auxilliary" utmp doesn't exist under linux. */
-   struct utmpx utx;
+-
+-#if (defined(SVR4) || defined(__SVR4)) && \
+-    !(defined(LINUX) || defined(__hpux) || defined (_AIX))
+-  /* This "auxilliary" utmp doesn't exist under linux. */
+-  struct utmpx utx;
 -  static int fdx = -1;
 -
 -  if(fdx < 0 && (fdx = open(WTMPX_FILE, O_WRONLY | O_APPEND, 0)) < 0) {
 -    log_pri(LOG_WARNING,"wtmpx %s: %s",WTMPX_FILE,strerror(errno));
 -    return -1;
 -  }
++  static int washere = 0;
  
++  if (!washere) {
++    utmpname(_PATH_WTMP);
++    washere = 1;
++  } else
++    washere = 0;
    /* 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
-@@ -551,13 +544,11 @@
+    * the field they don't have to be terminated at all.  Frankly, this sucks.
     * 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));
+-    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_syslen = strlen(utx.ut_host)+1;
-     utx.ut_pid = getpid();
-     time(&utx.ut_tv.tv_sec);
-     if(*name)
-@@ -566,22 +557,11 @@
-       utx.ut_type = DEAD_PROCESS;
-     utx.ut_exit.e_termination = 0;
-     utx.ut_exit.e_exit = 0;
+-    utx.ut_pid = getpid();
+-    time(&utx.ut_tv.tv_sec);
+-    if(*name)
+-      utx.ut_type = USER_PROCESS;
+-    else
+-      utx.ut_type = DEAD_PROCESS;
+-    utx.ut_exit.e_termination = 0;
+-    utx.ut_exit.e_exit = 0;
 -    if(write(fdx,(char*)&utx,sizeof(utx)) != sizeof(utx))
 -      ftruncate(fdx, buf.st_size);
 -  } else {
 -    log_debug(DEBUG0,"%s fstat(): %s",WTMPX_FILE,strerror(errno));
 -    res = -1;
 -  }
-+    updwtmpx(_PATH_WTMP, &utx);
- 
--#endif
--#endif /* SVR4 */
-+#else
-+  struct utmp ut;
- 
+-
+-#else /* Non-SVR4 systems */
+-
 -  if(fd < 0 && (fd = open(WTMP_FILE,O_WRONLY|O_APPEND,0)) < 0) {
 -    log_pri(LOG_WARNING,"wtmp %s: %s",WTMP_FILE,strerror(errno));
 -    return -1;
 -  }
 - 
 -  if(fstat(fd,&buf) == 0) {
-     memset(&ut,0,sizeof(ut));
+-    memset(&ut,0,sizeof(ut));
++  memset(&ut,0,sizeof(ut));
  #ifdef HAVE_UTMAXTYPE
  #ifdef LINUX
-@@ -612,12 +592,8 @@
+     if(ip)
+@@ -612,13 +575,12 @@
  #endif /* HAVE_UT_UT_HOST */
  
      time(&ut.ut_time);
@@ -84,8 +78,13 @@ diff -ur proftpd-1.2.0rc2.orig/src/log.c proftpd-1.2.0rc2/src/log.c
 -    log_debug(DEBUG0,"%s fstat(): %s",WTMP_FILE,strerror(errno));
 -    res = -1;
 -  }
-+    updwtmp(_PATH_WTMP, &ut);
-+#endif
+-#endif /* SVR4 */
++
++  setutent();
++  while ((getutent())) ;
++  pututline(&ut);
++  if (!washere)
++    endutent();
  
    return res;
  }