Merge pull request #787 from spbnick/coverity_fixes1

author Alan DeKok <aland@freeradius.org>

Tue, 9 Sep 2014 17:29:00 +0000 (13:29 -0400)

committer Alan DeKok <aland@freeradius.org>

Tue, 9 Sep 2014 17:29:00 +0000 (13:29 -0400)
author Alan DeKok <aland@freeradius.org>
Tue, 9 Sep 2014 17:29:00 +0000 (13:29 -0400)
committer Alan DeKok <aland@freeradius.org>
Tue, 9 Sep 2014 17:29:00 +0000 (13:29 -0400)
diff --cc src/main/listen.c
Simple merge
diff --cc src/modules/proto_dhcp/dhcp.c
Simple merge
author	Alan DeKok <aland@freeradius.org>
	Tue, 9 Sep 2014 17:29:00 +0000 (13:29 -0400)
committer	Alan DeKok <aland@freeradius.org>
	Tue, 9 Sep 2014 17:29:00 +0000 (13:29 -0400)
		1	2
src/main/listen.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/modules/proto_dhcp/dhcp.c	patch \|	diff1 \|	diff2 \|	blob \| history