Kolab Groupware OBS

Changes of Revision 46

0003-Canonification-for-multiple-domains.patch Changed

@@ -14,10 +14,10 @@
 --- a/ptclient/ldap.c
 +++ b/ptclient/ldap.c
 @@ -934,7 +934,58 @@ static int ptsmodule_get_dn(
-         if (rc != PTSM_OK)
-             return rc;
+	if (rc != PTSM_OK)
+	    return rc;
  
--        if (ptsm->domain_base_dn && ptsm->domain_base_dn[0] != '\0' && (strrchr(canon_id, '@') != NULL)) {
+-	if (ptsm->domain_base_dn && (strrchr(canon_id, '@') != NULL)) {
 +        if (ptsm->domain_base_dn && ptsm->domain_base_dn[0] != '\0' && (strrchr(canon_id, '@') == NULL)) {
 +            syslog(LOG_DEBUG, "collecting all domains from %s", ptsm->domain_base_dn);
 +
@@ -70,6 +70,6 @@
 +            }
 +        }
 +        else if (ptsm->domain_base_dn && ptsm->domain_base_dn[0] != '\0' && (strrchr(canon_id, '@') != NULL)) {
-             syslog(LOG_DEBUG, "Attempting to get domain for %s from %s", canon_id, ptsm->domain_base_dn);
+ 	    syslog(LOG_DEBUG, "Attempting to get domain for %s from %s", canon_id, ptsm->domain_base_dn);
  
-             /* Get the base dn to search from domain_base_dn searched on domain_scope with
+ 	    /* Get the base dn to search from domain_base_dn searched on domain_scope with