Stage 3 of refactoring. This reverses a couple of if checks so that the code is

easier to follow. The default svn diff looks ugle due to the spacing change. A
cleaner diff ignoring spacing changes can be found at:
http://people.apache.org/~rederpj/util_ldap_ignoring_spacing.diff


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@598846 13f79535-47bb-0310-9956-ffa450edef68