X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=proftpd-wtmp.patch;fp=proftpd-wtmp.patch;h=0000000000000000000000000000000000000000;hb=0f932318cb02b5a8d44187a3df16f2d6f93243d9;hp=9aa7aefb0aaa958519d08770c6b50e9742c774d4;hpb=12a4214d69ca6737c7ad56e40334953e31c805a0;p=packages%2Fproftpd.git

diff --git a/proftpd-wtmp.patch b/proftpd-wtmp.patch
deleted file mode 100644
index 9aa7aef..0000000
--- a/proftpd-wtmp.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -burNp proftpd-1.3.2.orig/src/log.c proftpd-1.3.2-dud/src/log.c
---- proftpd-1.3.2.orig/src/wtmp.c	2008-12-17 00:43:55.000000000 +0100
-+++ proftpd-1.3.2-dud/src/wtmp.c	2009-02-09 14:24:34.271689801 +0100
-@@ -129,9 +129,31 @@ int log_wtmp(char *line, const char *nam
-   struct utmp ut;
-   static int fd = -1;
- 
-+#if defined(HAVE_UTMPX_H)
-+#if !defined(WTMPX_FILE) && defined(_PATH_WTMPX)
-+# define WTMPX_FILE _PATH_WTMPX
-+#endif
-+  static char *wtmp_file = NULL;
-+  if (wtmp_file == NULL) {
-+    if (access(WTMPX_FILE"x", F_OK) == 0)
-+      wtmp_file = WTMPX_FILE"x";
-+    else if (access(WTMPX_FILE, F_OK) == 0)
-+      wtmp_file = WTMPX_FILE;
-+    else if (access(WTMP_FILE"x", F_OK) == 0)
-+      wtmp_file = WTMP_FILE"x";
-+    else if (access(WTMP_FILE, F_OK) == 0)
-+      wtmp_file = WTMP_FILE;
-+    else {
-+      pr_log_pri(PR_LOG_WARNING, "cannot find "WTMPX_FILE);
-+      return -1;
-+    }
-+  }
-+#else
-+  static char *wtmp_file = WTMP_FILE;
-+#endif
-   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));
-+      (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;
-   }
-