Attachment #153187 for bug #197829

View | Details | Raw Unified | Return to bug 197829
Collapse All | Expand All

Lines 2-9 Link Here

(-)Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= freeradius	4	PORTNAME= freeradius
5	DISTVERSION= 3.0.6	5	DISTVERSION= 3.0.7
6	PORTREVISION= 2	6	PORTREVISION=
7	CATEGORIES= net	7	CATEGORIES= net
8	MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \	8	MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
9	ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \	9	ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (freeradius-server-3.0.6.tar.bz2) = f9898b19564e7bf859396a9bdf492f72b918844b4916f1b46c56dfcd9e8dafcd	1	SHA256 (freeradius-server-3.0.7.tar.bz2) = 56251904344db9379129879f1bb97ff68639d3c63948db9273c337b34a5d851a
2	SIZE (freeradius-server-3.0.6.tar.bz2) = 2870327	2	SIZE (freeradius-server-3.0.7.tar.bz2) = 2923352




--- src/lib/event.c	2014-12-17 13:49:16.000000000 -0800
+++ src/lib/event.c	2015-01-07 10:06:46.000000000 -0800
@@ -630,9 +630,9 @@ 
 		 *	Loop over all of the events, servicing them.
 		 */
 		for (i = 0; i < rcode; i++) {
-			if (el->events[i].flags & EV_EOF) {
-				fr_event_fd_t *ef = el->events[i].udata;
+			fr_event_fd_t *ef = el->events[i].udata;
 
+			if (el->events[i].flags & EV_EOF) {
 				/*
 				 *	FIXME: delete the handler
 				 *	here, and fix process.c to not
@@ -646,14 +646,12 @@ 
 				continue;
 			}
 
-			if (el->events[i].flags & EVFILT_READ) {
-				fr_event_fd_t *ef = el->events[i].udata;
-
-				ef->handler(el, ef->fd, ef->ctx);
-				continue;
-			}
-
-			/* else it's an unhandled event, which shouldn't happen */
+			/*
+			 *	Else it's our event.  We only set
+			 *	EVFILT_READ, so it must be a read
+			 *	event.
+			 */
+			ef->handler(el, ef->fd, ef->ctx);
 		}
 #endif	/* HAVE_KQUEUE */
 	}

Lines 12-17 Link Here

(-)pkg-plist (+7 lines)
12	bin/radtest	12	bin/radtest
13	bin/radwho	13	bin/radwho
14	bin/radzap	14	bin/radzap
		15	bin/rbmonkey
15	bin/rlm_ippool_tool	16	bin/rlm_ippool_tool
16	bin/smbencrypt	17	bin/smbencrypt
17	include/freeradius/attributes.h	18	include/freeradius/attributes.h
Lines 244-249 Link Here
244	%%SQLITE3%%%%LIBDIR%%/rlm_sql_sqlite.a	245	%%SQLITE3%%%%LIBDIR%%/rlm_sql_sqlite.a
245	%%SQLITE3%%%%LIBDIR%%/rlm_sql_sqlite.la	246	%%SQLITE3%%%%LIBDIR%%/rlm_sql_sqlite.la
246	%%SQLITE3%%%%LIBDIR%%/rlm_sql_sqlite.so	247	%%SQLITE3%%%%LIBDIR%%/rlm_sql_sqlite.so
		248	%%LIBDIR%%/rlm_test.a
		249	%%LIBDIR%%/rlm_test.la
		250	%%LIBDIR%%/rlm_test.so
247	%%LIBDIR%%/rlm_unix.a	251	%%LIBDIR%%/rlm_unix.a
248	%%LIBDIR%%/rlm_unix.la	252	%%LIBDIR%%/rlm_unix.la
249	%%LIBDIR%%/rlm_unix.so	253	%%LIBDIR%%/rlm_unix.so
Lines 780-785 Link Here
780	%%DATADIR%%/dictionary.packeteer	784	%%DATADIR%%/dictionary.packeteer
781	%%DATADIR%%/dictionary.paloalto	785	%%DATADIR%%/dictionary.paloalto
782	%%DATADIR%%/dictionary.patton	786	%%DATADIR%%/dictionary.patton
		787	%%DATADIR%%/dictionary.perle
783	%%DATADIR%%/dictionary.propel	788	%%DATADIR%%/dictionary.propel
784	%%DATADIR%%/dictionary.prosoft	789	%%DATADIR%%/dictionary.prosoft
785	%%DATADIR%%/dictionary.proxim	790	%%DATADIR%%/dictionary.proxim
Lines 821-826 Link Here
821	%%DATADIR%%/dictionary.riverstone	826	%%DATADIR%%/dictionary.riverstone
822	%%DATADIR%%/dictionary.roaringpenguin	827	%%DATADIR%%/dictionary.roaringpenguin
823	%%DATADIR%%/dictionary.ruckus	828	%%DATADIR%%/dictionary.ruckus
		829	%%DATADIR%%/dictionary.ruggedcom
824	%%DATADIR%%/dictionary.sg	830	%%DATADIR%%/dictionary.sg
825	%%DATADIR%%/dictionary.shasta	831	%%DATADIR%%/dictionary.shasta
826	%%DATADIR%%/dictionary.shiva	832	%%DATADIR%%/dictionary.shiva
Lines 838-843 Link Here
838	%%DATADIR%%/dictionary.telkom	844	%%DATADIR%%/dictionary.telkom
839	%%DATADIR%%/dictionary.terena	845	%%DATADIR%%/dictionary.terena
840	%%DATADIR%%/dictionary.trapeze	846	%%DATADIR%%/dictionary.trapeze
		847	%%DATADIR%%/dictionary.travelping
841	%%DATADIR%%/dictionary.tropos	848	%%DATADIR%%/dictionary.tropos
842	%%DATADIR%%/dictionary.ukerna	849	%%DATADIR%%/dictionary.ukerna
843	%%DATADIR%%/dictionary.unix	850	%%DATADIR%%/dictionary.unix

Return to bug 197829

Lines 1-35 Link Here

(-)files/patch-src__lib__event.c (-35 lines)
1	--- src/lib/event.c 2014-12-17 13:49:16.000000000 -0800
2	+++ src/lib/event.c 2015-01-07 10:06:46.000000000 -0800
3	@@ -630,9 +630,9 @@
4	* Loop over all of the events, servicing them.
5	*/
6	for (i = 0; i < rcode; i++) {
7	- if (el->events[i].flags & EV_EOF) {
8	- fr_event_fd_t *ef = el->events[i].udata;
9	+ fr_event_fd_t *ef = el->events[i].udata;
10
11	+ if (el->events[i].flags & EV_EOF) {
12	/*
13	* FIXME: delete the handler
14	* here, and fix process.c to not
15	@@ -646,14 +646,12 @@
16	continue;
17	}
18
19	- if (el->events[i].flags & EVFILT_READ) {
20	- fr_event_fd_t *ef = el->events[i].udata;
21	-
22	- ef->handler(el, ef->fd, ef->ctx);
23	- continue;
24	- }
25	-
26	- /* else it's an unhandled event, which shouldn't happen */
27	+ /*
28	+ * Else it's our event. We only set
29	+ * EVFILT_READ, so it must be a read
30	+ * event.
31	+ */
32	+ ef->handler(el, ef->fd, ef->ctx);
33	}
34	#endif /* HAVE_KQUEUE */
35	}