X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=blobdiff_plain;f=rpm-sources%2Ffreeradius-rlm_attr_filter-fix.patch;fp=rpm-sources%2Ffreeradius-rlm_attr_filter-fix.patch;h=0000000000000000000000000000000000000000;hp=ffa06367b176cdb8e7a973505ee1d6a4777bba57;hb=b14194ec327d694bc84fbab67ef3689711cc2dad;hpb=60450f58765da6ab187477a5cbfcb8fbd6c3b485

diff --git a/rpm-sources/freeradius-rlm_attr_filter-fix.patch b/rpm-sources/freeradius-rlm_attr_filter-fix.patch
deleted file mode 100644
index ffa0636..0000000
--- a/rpm-sources/freeradius-rlm_attr_filter-fix.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From a23188a41197069a396886b477bd4463ce6c5365 Mon Sep 17 00:00:00 2001
-From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
-Date: Wed, 12 Mar 2014 21:41:26 +0000
-Subject: [PATCH] Compare da not just attribute number (fix clashing vendor and RFC space attributes)
-
----
- src/modules/rlm_attr_filter/rlm_attr_filter.c | 4 ++--
- src/modules/rlm_attr_filter/rlm_attr_filter.c | 43 ++++++++++++++++-----------
- 2 files changed, 27 insertions(+), 20 deletions(-)
-
-diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c
-index e153cd1..1f72d6c 100644
---- a/src/modules/rlm_attr_filter/rlm_attr_filter.c
-+++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c
-@@ -268,8 +268,8 @@ static rlm_rcode_t attr_filter_common(void *instance, REQUEST *request, RADIUS_P
- 					continue;
- 				}
- 
--				if (input_item->da->attr == check_item->da->attr) {
--					check_pair(check_item, input_item, &pass, &fail);
-+				if (input_item->da == check_item->da) {
-+					check_pair(request, check_item, input_item, &pass, &fail);
- 				}
- 			}
- 
-diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c
-index 1f72d6c..19b5b45 100644
---- a/src/modules/rlm_attr_filter/rlm_attr_filter.c
-+++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c
-@@ -57,24 +57,34 @@
- 	{ NULL, -1, 0, NULL, NULL }
- };
- 
--static void check_pair(VALUE_PAIR *check_item, VALUE_PAIR *reply_item,
--		      int *pass, int *fail)
-+static void check_pair(REQUEST *request, VALUE_PAIR *check_item, VALUE_PAIR *reply_item, int *pass, int *fail)
- {
- 	int compare;
- 
- 	if (check_item->op == T_OP_SET) return;
- 
- 	compare = paircmp(check_item, reply_item);
-+	if (compare < 0) {
-+		REDEBUG("Comparison failed: %s", fr_strerror());
-+	}
-+
- 	if (compare == 1) {
- 		++*(pass);
- 	} else {
- 		++*(fail);
- 	}
- 
-+	if (RDEBUG_ENABLED3) {
-+		char rule[1024], pair[1024];
-+
-+		vp_prints(rule, sizeof(rule), check_item);
-+		vp_prints(pair, sizeof(pair), reply_item);
-+		RDEBUG3("%s %s %s", pair, compare == 1 ? "allowed by" : "disallowed by", rule);
-+	}
-+
- 	return;
- }
- 
--
- static int attr_filter_getfile(TALLOC_CTX *ctx, char const *filename, PAIR_LIST **pair_list)
- {
- 	vp_cursor_t cursor;
-@@ -216,8 +226,7 @@ static rlm_rcode_t attr_filter_common(void *instance, REQUEST *request, RADIUS_P
- 				fall_through = 1;
- 				continue;
- 			}
--			else if (!check_item->da->vendor &&
--				 check_item->da->attr == PW_RELAX_FILTER) {
-+			else if (!check_item->da->vendor && check_item->da->attr == PW_RELAX_FILTER) {
- 				relax_filter = check_item->vp_integer;
- 				continue;
- 			}
-@@ -247,20 +256,17 @@ static rlm_rcode_t attr_filter_common(void *instance, REQUEST *request, RADIUS_P
- 		for (input_item = paircursor(&input, &packet->vps);
- 		     input_item;
- 		     input_item = pairnext(&input)) {
--			/* reset the pass,fail vars for each reply item */
--			pass = fail = 0;
-+			pass = fail = 0; /* reset the pass,fail vars for each reply item */
- 
- 			/*
--			 *	reset the check_item pointer to
--			 *	beginning of the list
-+			 *  Reset the check_item pointer to beginning of the list
- 			 */
- 			for (check_item = pairfirst(&check);
- 			     check_item;
- 			     check_item = pairnext(&check)) {
- 				/*
--				 *	Vendor-Specific is special, and
--				 *	matches any VSA if the comparison
--				 *	is always true.
-+				 *  Vendor-Specific is special, and matches any VSA if the
-+				 *  comparison is always true.
- 				 */
- 				if ((check_item->da->attr == PW_VENDOR_SPECIFIC) && (input_item->da->vendor != 0) &&
- 				    (check_item->op == T_OP_CMP_TRUE)) {
-@@ -273,14 +279,15 @@ static rlm_rcode_t attr_filter_common(void *instance, REQUEST *request, RADIUS_P
- 				}
- 			}
- 
-+			RDEBUG3("Attribute \"%s\" allowed by %i rules, disallowed by %i rules",
-+				input_item->da->name, pass, fail);
- 			/*
--			 *  Only move attribute if it passed all rules,
--			 *  or if the config says we should copy unmatched
--			 *  attributes ('relaxed' mode).
-+			 *  Only move attribute if it passed all rules, or if the config says we
-+			 *  should copy unmatched attributes ('relaxed' mode).
- 			 */
- 			if (fail == 0 && (pass > 0 || relax_filter)) {
- 				if (!pass) {
--					RDEBUG3("Attribute (%s) allowed by relaxed mode", input_item->da->name);
-+					RDEBUG3("Attribute \"%s\" allowed by relaxed mode", input_item->da->name);
- 				}
- 				vp = paircopyvp(packet, input_item);
- 				if (!vp) {
-@@ -355,11 +362,11 @@ static rlm_rcode_t attr_filter_common(void *instance, REQUEST *request, RADIUS_P
- 	mod_instantiate,	/* instantiation */
- 	NULL,			/* detach */
- 	{
--		NULL,			/* authentication */
-+		NULL,		/* authentication */
- 		mod_authorize,	/* authorization */
- 		mod_preacct,	/* pre-acct */
- 		mod_accounting,	/* accounting */
--		NULL,			/* checksimul */
-+		NULL,		/* checksimul */
- #ifdef WITH_PROXY
- 		mod_pre_proxy,	/* pre-proxy */
- 		mod_post_proxy,	/* post-proxy */
--- 
-1.8.5.5