Request 3132 (accepted)

Overview

Request 3132 (accepted)

New release

Created by mollekopf over 1 year ago
In state accepted
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit kolab-webadmin

Submit package Kolab:16:Testing / kolab-webadmin to package Kolab:16 / kolab-webadmin

buildtarball.sh Changed

kolab-webadmin-3.2.16.tar.gz/composer.lock Changed

kolab-webadmin-3.2.16.tar.gz/vendor/autoload.php Changed

kolab-webadmin-3.2.16.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit04ebda2b969986cdc27e322d5bd7b5ec
+class ComposerAutoloaderInit19afba4b5a430345b9f9c9eef78fda60
 {
     private static $loader;
 
@@ -24,9 +24,9 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit04ebda2b969986cdc27e322d5bd7b5ec', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit19afba4b5a430345b9f9c9eef78fda60', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit04ebda2b969986cdc27e322d5bd7b5ec', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit19afba4b5a430345b9f9c9eef78fda60', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths = get_include_path();
@@ -36,7 +36,7 @@
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit04ebda2b969986cdc27e322d5bd7b5ec::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit19afba4b5a430345b9f9c9eef78fda60::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {

kolab-webadmin-3.2.16.tar.gz/vendor/composer/autoload_static.php Changed

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit04ebda2b969986cdc27e322d5bd7b5ec
+class ComposerStaticInit19afba4b5a430345b9f9c9eef78fda60
 {
     public static $prefixesPsr0 = array (
         'N' => 
@@ -237,9 +237,9 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixesPsr0 = ComposerStaticInit04ebda2b969986cdc27e322d5bd7b5ec::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit04ebda2b969986cdc27e322d5bd7b5ec::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit04ebda2b969986cdc27e322d5bd7b5ec::$classMap;
+            $loader->prefixesPsr0 = ComposerStaticInit19afba4b5a430345b9f9c9eef78fda60::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInit19afba4b5a430345b9f9c9eef78fda60::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInit19afba4b5a430345b9f9c9eef78fda60::$classMap;
 
         }, null, ClassLoader::class);
     }

kolab-webadmin-3.2.16.tar.gz/vendor/composer/installed.json Changed

kolab-webadmin-3.2.16.tar.gz/vendor/composer/installed.php Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/ORIG_HEAD Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/index Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/info/refs Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/logs/HEAD Changed

@@ -1,3 +1,3 @@
-0000000000000000000000000000000000000000 c00dcbd05daa8be57b60ce59b8fb03f424e76bcd Christian Mollekopf <mollekopf@apheleia-it.ch> 1682592098 +0200	clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
-c00dcbd05daa8be57b60ce59b8fb03f424e76bcd c00dcbd05daa8be57b60ce59b8fb03f424e76bcd Christian Mollekopf <mollekopf@apheleia-it.ch> 1682592098 +0200	checkout: moving from master to master
-c00dcbd05daa8be57b60ce59b8fb03f424e76bcd c00dcbd05daa8be57b60ce59b8fb03f424e76bcd Christian Mollekopf <mollekopf@apheleia-it.ch> 1682592098 +0200	reset: moving to c00dcbd05daa8be57b60ce59b8fb03f424e76bcd
+0000000000000000000000000000000000000000 5fa4880317618d053afb32ee2b3a6f388ef1b38d Christian Mollekopf <mollekopf@apheleia-it.ch> 1682685846 +0200	clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
+5fa4880317618d053afb32ee2b3a6f388ef1b38d 5fa4880317618d053afb32ee2b3a6f388ef1b38d Christian Mollekopf <mollekopf@apheleia-it.ch> 1682685846 +0200	checkout: moving from master to master
+5fa4880317618d053afb32ee2b3a6f388ef1b38d 5fa4880317618d053afb32ee2b3a6f388ef1b38d Christian Mollekopf <mollekopf@apheleia-it.ch> 1682685846 +0200	reset: moving to 5fa4880317618d053afb32ee2b3a6f388ef1b38d

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/heads/master Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/remotes/origin/HEAD Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/info/packs Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-793892001401ec5d9cf66f132ba703f4de39cac4.idx Deleted

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-793892001401ec5d9cf66f132ba703f4de39cac4.pack Deleted

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-9000a48131cbccc467cb4ef37bd8b9a5236c5c4e.idx Added

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-9000a48131cbccc467cb4ef37bd8b9a5236c5c4e.pack Added

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/packed-refs Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/refs/heads/master Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/lib/Net/LDAP3.php Changed

@@ -785,20 +785,40 @@
         }
 
         $output = array();
-        $command = Array(
-                $moz_ldapsearch,
-                '-x',
-                '-h',
-                $this->_current_host,
-                '-b',
-                escapeshellarg($entry_dn),
-                '-s',
-                'base',
-                '-D',
-                escapeshellarg($this->_current_bind_dn),
-                '-w',
-                escapeshellarg($this->_current_bind_pw)
-            );
+
+        if ($moz_ldapsearch == "/usr/bin/ldapsearch") {
+            $command = Array(
+                    $moz_ldapsearch,
+                    '-x',
+                    '-h',
+                    preg_replace('|^a-z+://|i', '', $this->_current_host),
+                    '-b',
+                    escapeshellarg($entry_dn),
+                    '-s',
+                    'base',
+                    '-D',
+                    escapeshellarg($this->_current_bind_dn),
+                    '-w',
+                    escapeshellarg($this->_current_bind_pw)
+                );
+        } else {
+            $command = Array(
+                    $moz_ldapsearch,
+                    '-x',
+                    '-h',
+                    preg_replace('|^a-z+://|i', '', $this->_current_host),
+                    '-p',
+                    $this->config_get('port', 389),
+                    '-b',
+                    escapeshellarg($entry_dn),
+                    '-s',
+                    'base',
+                    '-D',
+                    escapeshellarg($this->_current_bind_dn),
+                    '-w',
+                    escapeshellarg($this->_current_bind_pw)
+                );
+        }
 
         if ($this->vendor_name() == "Oracle Corporation") {
             // For Oracle DSEE

Build Results
RPM Lint

Refresh

Comments for request 3132 0

Request History

mollekopf created request over 1 year ago

New release

mollekopf accepted request over 1 year ago