Patch failes at DirectoryLDAP.php

[cyberdaemon]

Hi,

I've setuap a new Kolab 3.1 server and when running the patch i get following error:

patching file lib/Kolab/FreeBusy/DirectoryLDAP.php
Hunk #1 FAILED at 99.
1 out of 1 hunk FAILED -- saving rejects to file lib/Kolab/FreeBusy/DirectoryLDAP.php.rej

Contents of rej file:

--- lib/Kolab/FreeBusy/DirectoryLDAP.php
+++ lib/Kolab/FreeBusy/DirectoryLDAP.php
@@ -99,9 +99,17 @@
$result = array('s' => $user);

            if ($this->ready) {

•                    $base_dn = $config['base_dn'];
  

•                    if ($base_dn = '%dc') {
  

•                        list($u, $d) = explode('@', $user);
  

•                        $base_dn = 'dc='.strtr($d, array('.' => ',dc='));
  

•                    }
  

  •               // search with configured filter
                  $filter = preg_replace('/%s/i', $user, $this->config['filter']);
    

•                   $ldapresult = $this->ldap->search($this->config['base_dn'], $filter, 'sub');
  

•                   $ldapresult = $this->ldap->search($base_dn, $filter, 'sub');
  
                  // got a valid result
                  if ($ldapresult && $ldapresult->count()) {
  

[tpokorra]

sorry, my mistake.
the patch was for trunk, now I have fixed it so that it works against Kolab 3.1 Updates.

[cyberdaemon]

Thx. Should I patch only the DirectoryLDAP.php as the other patches where successful.

[tpokorra]

yes, it is the last patch that is applied in initMultiDomain.sh, so that should work to just apply it manually.