shib.conf conflict

[Ferenc Wagner]

Russ Allbery <rra at debian.org> writes:

> We should get this fix into lenny, which will mean making a lenny branch
> off of the old master before we merged in Shibboleth 2.1.  I can take a
> look at doing that.

I gave it a try.  Please review, possibly botched it...  Apart from
that, should we also take care of the 2.0.dfsg1-3 -> 2.0.dfsg1-4
upgrade?  I don't know much about the possible conffile migration
issues, but surely they are numerous.
-- 
Regards,
Feri.