From 9eb877eb3b902f03ee71d37d38e6525db67945a1 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 12 Jul 2017 18:28:10 +0200 Subject: [PATCH] fix fatal error if sambaadmin is not installed, but was before --- api/src/Accounts/Ldap.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/src/Accounts/Ldap.php b/api/src/Accounts/Ldap.php index 685b768ab9..e80c672408 100644 --- a/api/src/Accounts/Ldap.php +++ b/api/src/Accounts/Ldap.php @@ -1199,7 +1199,8 @@ class Ldap $this->frontend->exists(-1 * $sign * $account_id) || // if sambaadmin is installed, call it to check there's not yet a relative id (last part of SID) with that number // to ease migration to AD or Samba4 - $GLOBALS['egw_info']['apps']['sambaadmin'] && ExecMethod2('sambaadmin.sosambaadmin.sidExists', $account_id))); + file_exists(EGW_SERVER_ROOT.'/sambaadmin') && $GLOBALS['egw_info']['apps']['sambaadmin'] && + ExecMethod2('sambaadmin.sosambaadmin.sidExists', $account_id))); if (!$account_id || $max && $account_id > $max) {