No subject

few lines up, where ciaddr is zero it actually is the IP source address
of the packet as it reaches the DHCP server.

Which could be more wrong than giaddr - it might be the address of
the relay on the interface facing the DHCP server.

Probably the giaddr should only be used to find the subnet if the
ciaddr (not 'cid') is zero.  I'll open a bug ticket.

-- 
David W. Hankins	"If you don't do it right the first time,
Software Engineer		you'll just have to do it again."
Internet Systems Consortium, Inc.	-- Jack T. Hankins