diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-08-04 07:11:32 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-08-04 07:11:32 +0000 |
| commit | 65112e039df30fab7421a2566a2e95f7b30f926a (patch) | |
| tree | 67dd3d841fd8e98436c32c0a8d135c9385028cae /ftp/proftpd/files/patch-src-wtmp.c | |
| parent | - Use correct modulname for kldstat (diff) | |
Update ProFTPd to 1.3.4b
Notes
Notes:
svn path=/head/; revision=302003
Diffstat (limited to 'ftp/proftpd/files/patch-src-wtmp.c')
| -rw-r--r-- | ftp/proftpd/files/patch-src-wtmp.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/ftp/proftpd/files/patch-src-wtmp.c b/ftp/proftpd/files/patch-src-wtmp.c index 43c542ea179a..a73ecf1f7fe5 100644 --- a/ftp/proftpd/files/patch-src-wtmp.c +++ b/ftp/proftpd/files/patch-src-wtmp.c @@ -1,14 +1,5 @@ ---- src/wtmp.c.orig 2011-05-23 23:22:24.000000000 +0200 -+++ src/wtmp.c 2012-07-17 16:19:34.188505949 +0200 -@@ -42,7 +42,7 @@ - !(defined(LINUX) || defined(__hpux) || defined (_AIX)) - /* This "auxilliary" utmp doesn't exist under linux. */ - --#if defined(__sparcv9) && !defined(__NetBSD__) -+#if defined(__sparcv9) && !defined(__NetBSD__) && !defined(__FreeBSD__) - struct futmpx utx; - time_t t; - +--- src/wtmp.c.orig 2012-08-04 08:45:32.292505678 +0200 ++++ src/wtmp.c 2012-08-04 08:45:35.508505108 +0200 @@ -97,7 +97,7 @@ #else /* SVR4 */ utx.ut_syslen = strlen(utx.ut_host)+1; @@ -18,13 +9,3 @@ time(&t); utx.ut_tv.tv_sec = (time32_t)t; # else -@@ -126,7 +126,9 @@ - } - - #else /* Non-SVR4 systems */ -+#if !defined(__FreeBSD_version) || __FreeBSD_version < 900007 || !defined(HAVE_UTMPX_H) - struct utmp ut; -+#endif - static int fd = -1; - - if (fd < 0 && |