* No need for an else block here because we do a return above.

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

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 8941903111961dc30448fb1e2c9ec034c2874696..792ad0a1891ff4556725cfac7c3ab422632e847d 100644 (file)
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -1115,18 +1115,17 @@ static int uldap_cache_check_subgroups(request_rec *r, util_ldap_connection_t *l
             ldc->reason = "check_subgroups failed to find the cache entry to add sub-group list to.";
             return LDAP_COMPARE_FALSE;
         }
+        /*
+         * overwrite SGL if it was previously updated between the last
+         * two times we looked at the cache
+         */
+        compare_nodep->sgl_processed = 1;
+        if (tmp_local_sgl) {
+            compare_nodep->subgroupList = util_ald_sgl_dup(curl->compare_cache, tmp_local_sgl);
+        }
         else {
-             /* overwrite SGL if it was previously updated between the last
-             ** two times we looked at the cache
-             */
-             compare_nodep->sgl_processed = 1;
-             if (tmp_local_sgl) {
-                 compare_nodep->subgroupList = util_ald_sgl_dup(curl->compare_cache, tmp_local_sgl);
-             }
-             else {
-                 /* We didn't find a single subgroup, next time save us from looking */
-                 compare_nodep->subgroupList = NULL;
-             }
+            /* We didn't find a single subgroup, next time save us from looking */
+            compare_nodep->subgroupList = NULL;
         }
         LDAP_CACHE_UNLOCK();
     }