Ignore the diff I just sent -- the version of innconf.h in the inn-current does have the USE_OVERCHAN stuff added, just in a different place, so when I imported today's inn-current into my local CVS repository, CVS thought that patch was still in my source but not in the vendor (INN) branch. Sorry about that.