Bug found in ipnat's RDR code

["Matthew E. Patton" <pattonme@gnpr.pae.osd.mil>]

I've found the condition that causes the RDR code to fail in v2.1 (stock) of
OpenBSD. The rules are order sensitive!! ie. if you put ANY 'map' commands
before a 'rdr' the rdr portion will fail. If you flip the sequence around 
such that ALL 'rdr's precede 'map' commands, it works like a charm.

Those of you who also reported this problem can you try it on your systems and
confirm? I'm delighted I don't have to resort to the netcat workaround useful
though it was (thanks Jake). Is this bug/behavior fixed in 2.2 or -current?
I don't have the source handy (am working on 2.2 upgrade) so I don't know 
where the particular offending piece of code resides but it shouldn't be too
hard to find. Anyone want to look for and fix it?