ext_kerberos_ldap_group_acl: Fix various bugs in rev.12512

Two issues added by patch hunk mis-alignment in rev.12512.
and correct patch for issue 740423.

 Detected by Coverity Scan. Issues 751097, 740423, 751096

diff --git a/helpers/external_acl/kerberos_ldap_group/support_ldap.cc b/helpers/external_acl/kerberos_ldap_group/support_ldap.cc
index d8fe9ac8e35d53f2871fb345f33e8fae1e45b568..7b53ad517988bc784cd9579726bf1738fde2fe19 100644 (file)
--- a/helpers/external_acl/kerberos_ldap_group/support_ldap.cc
+++ b/helpers/external_acl/kerberos_ldap_group/support_ldap.cc
@@ -1165,9 +1165,10 @@ get_memberof(struct main_args *margs, char *user, char *domain, char *group)
 
             debug((char *) "%s| %s: DEBUG: Users primary group %s %s\n", LogTime(), PROGRAM, retval ? "matches" : "does not match", group);
 
-        } else
+        } else {
             ldap_msgfree(res);
-        debug((char *) "%s| %s: DEBUG: Did not find ldap entry for group %s\n", LogTime(), PROGRAM, group);
+            debug((char *) "%s| %s: DEBUG: Did not find ldap entry for group %s\n", LogTime(), PROGRAM, group);
+        }
         /*
          * Cleanup
          */

diff --git a/helpers/external_acl/kerberos_ldap_group/support_lserver.cc b/helpers/external_acl/kerberos_ldap_group/support_lserver.cc
index df9b64b23174a8d07c2607fde34db3328790d41e..d7e4bd018323c7e3e14007d0320e6e0573a20e47 100644 (file)
--- a/helpers/external_acl/kerberos_ldap_group/support_lserver.cc
+++ b/helpers/external_acl/kerberos_ldap_group/support_lserver.cc
@@ -88,6 +88,11 @@ create_ls(struct main_args *margs)
                 free_ls(lssp);
                 return (1);
             }
+            if (dp) {  /* end of domain name - twice */
+                debug((char *) "%s| %s: @ is not allowed in server name %s@%s\n",LogTime(), PROGRAM,np,dp);
+                free_ls(lssp);
+                return(1);
+            }
             *p = '\0';
             ++p;
             lssp = init_ls();
@@ -100,11 +105,6 @@ create_ls(struct main_args *margs)
                 free_ls(lssp);
                 return (1);
             }
-            if (dp) {  /* end of domain name - twice */
-                debug((char *) "%s| %s: @ is not allowed in server name %s@%s\n",LogTime(), PROGRAM,np,dp);
-                free_ls(lssp);
-                return(1);
-            }
             *p = '\0';
             ++p;
             if (dp) {          /* end of domain name */