Remove allowed_sender_reload.patch

Patch has been merged upstream.

2 files changed, 0 insertions, 60 deletions

diff --git a/debian/patches/allowed_sender_reload.patch b/debian/patches/allowed_sender_reload.patch
deleted file mode 100644
index f503070..0000000
--- a/debian/patches/allowed_sender_reload.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Mon, 12 Jan 2009 12:05:45 +0000 (+0100)
-Subject: fixed a potential segfault condition with $AllowedSender directive
-X-Git-Url: http://git.adiscon.com/?p=rsyslog.git;a=commitdiff_plain;h=20ff1ed403f05606b68c13e4d5c591c6b8706f86
-
-fixed a potential segfault condition with $AllowedSender directive
-
-On HUP, the root pointers were not properly cleaned up. Thanks to
-Michael Biebel, olgoat, and Juha Koho for reporting and analyzing
-the bug.
----
-
-Index: rsyslog/runtime/net.c
-===================================================================
---- rsyslog.orig/runtime/net.c	2009-01-16 00:06:21.000000000 +0100
-+++ rsyslog/runtime/net.c	2009-01-16 00:07:23.000000000 +0100
-@@ -116,6 +116,30 @@
- finalize_it:
- 	RETiRet;
- }
-+/* re-initializes (sets to NULL) the correct allow root pointer
-+ * rgerhards, 2009-01-12
-+ */
-+static inline rsRetVal
-+reinitAllowRoot(uchar *pszType)
-+{
-+	DEFiRet;
-+
-+	if(!strcmp((char*)pszType, "UDP"))
-+		pAllowedSenders_UDP = NULL;
-+	else if(!strcmp((char*)pszType, "TCP"))
-+		pAllowedSenders_TCP = NULL;
-+#ifdef USE_GSSAPI
-+	else if(!strcmp((char*)pszType, "GSS"))
-+		pAllowedSenders_GSS = NULL;
-+#endif
-+	else {
-+		dbgprintf("program error: invalid allowed sender ID '%s', denying...\n", pszType);
-+		ABORT_FINALIZE(RS_RET_CODE_ERR); /* everything is invalid for an invalid type */
-+	}
-+
-+finalize_it:
-+	RETiRet;
-+}
- 
- 
- /* add a wildcard entry to this permitted peer. Entries are always
-@@ -556,6 +580,11 @@
- 			free(pPrev->allowedSender.addr.NetAddr);
- 		free(pPrev);
- 	}
-+
-+	/* indicate root pointer is de-init (was forgotten previously, resulting in
-+	 * all kinds of interesting things) -- rgerhards, 2009-01-12
-+	 */
-+	reinitAllowRoot(pszType);
- }
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index e6e8263..8a12239 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 no_create_db.patch
 manpage_fixes.patch
-allowed_sender_reload.patch