From mark: special handling for PRODUCTION_PRINCIPAL and TEST_PRINCIPAL.

diff --git a/incremental/ldap/winad.c b/incremental/ldap/winad.c
index 9849d2eca8db6f3dc216dc0abb433e73a82f5a0e..ac93986d8a143ce02b5cbd9f105c7c23e381d8b6 100755 (executable)
--- a/incremental/ldap/winad.c
+++ b/incremental/ldap/winad.c
@@ -6040,8 +6040,15 @@ int populate_group(LDAP *ldap_handle, char *dn_path, char *group_name,
               continue;
             }
          
-         if(!strcasecmp(ptr->type, "USER")) 
+         if(!strcasecmp(ptr->type, "USER"))
            {
+             if(!strcasecmp(ptr->member, PRODUCTION_PRINCIPAL) ||
+                !strcasecmp(ptr->member, TEST_PRINCIPAL))
+               {
+                 ptr = ptr->next;
+                 continue;
+               }
+
              if ((rc = check_user(ldap_handle, dn_path, ptr->member,
                                   "")) == AD_NO_USER_FOUND)
                {