From c512cbd42f8d5e606a9edc0f9e8f4408c7225897 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Tue, 6 Nov 2007 15:39:43 +0000
Subject: Remove FETCHMAIL_DEBUG diversion that couldn't be officially enabled
 and was prone to symlink attacks. Found by Nico Golde.

svn path=/branches/BRANCH_6-3/; revision=5134
---
 NEWS        |  5 +++++
 fetchmail.h | 12 ------------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/NEWS b/NEWS
index 0ef1534d..a5c4e4e8 100644
--- a/NEWS
+++ b/NEWS
@@ -67,6 +67,11 @@ fetchmail 6.3.9 (not yet released):
   Fixes Debian Bug#421446 (Holger Leskien), Novell Bug #247233 (Jon Nelson).
   Thanks to Matthias Strauß for a configuration to reproduce the issue.
 
+# CHANGES:
+* Removed dead FETCHMAIL_DEBUG code from fetchmail.h that was disabled by 
+  default with no switches in configure to enable it. However, the macro would 
+  have been prone to a symlink attack. Found by Nico Golde.
+
 # DOCUMENTATION:
 * Add fetchmail-SA-2007-02.txt
 * Re-add two lines to the manual page that had accidentally become comments 
diff --git a/fetchmail.h b/fetchmail.h
index 605bcb05..107dffc1 100644
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -716,18 +716,6 @@ char *strerror (int);
 char *stpcpy(char *, const char*);
 #endif
 
-#ifdef FETCHMAIL_DEBUG
-#define exit(e) do { \
-       FILE *out; \
-       out = fopen("/tmp/fetchmail.log", "a"); \
-       fprintf(out, \
-               "Exiting fetchmail from file %s, line %d with status %d\n", \
-               __FILE__, __LINE__, e); \
-       fclose(out); \
-       _exit(e); \
-       } while(0)
-#endif /* FETCHMAIL_DEBUG */
-
 #ifdef __CYGWIN__
 #define ROOT_UID 18
 #else /* !__CYGWIN__ */
-- 
cgit v1.2.3