21.5 patch [Re: 21.4.{17,18} configure.in and ldap]