-
-
Notifications
You must be signed in to change notification settings - Fork 4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow to set a custom timeout for ldap connections #35355
Conversation
Signed-off-by: Louis Chemineau <louis@chmn.me>
0ad63f6
to
a781ae3
Compare
/backport to stable24 |
/backport to stable25 |
@@ -649,6 +649,10 @@ | |||
throw new ServerNotAvailableException('Could not disable LDAP referrals.'); | |||
} | |||
|
|||
if (!$this->ldap->setOption($this->ldapConnectionRes, LDAP_OPT_NETWORK_TIMEOUT, $this->configuration->ldapConnectionTimeout)) { |
Check failure
Code scanning / Psalm
UndefinedConstant
@@ -649,6 +649,10 @@ | |||
throw new ServerNotAvailableException('Could not disable LDAP referrals.'); | |||
} | |||
|
|||
if (!$this->ldap->setOption($this->ldapConnectionRes, LDAP_OPT_NETWORK_TIMEOUT, $this->configuration->ldapConnectionTimeout)) { |
Check notice
Code scanning / Psalm
PossiblyFalseArgument
@blizzz is this enough ? What about psalm errors ? Why aren't they triggered for the other lines 🤔 |
They actually are, but de facto we will not see a false here. Only resources or resource classes, but I failed to get a |
/backport to stable25 |
The backport to stable25 failed. Please do this backport manually. |
nextcloud/server#35355 Signed-off-by: Louis Chemineau <louis@chmn.me>
nextcloud/server#35355 Signed-off-by: Louis Chemineau <louis@chmn.me>
nextcloud/server#35355 Signed-off-by: Louis Chemineau <louis@chmn.me>
hello @artonge |
Simply forgot to remove it nextcloud/documentation#9618 |
Not tested, only blind copying and pasting. Could @blizzz or @come-nc test this new setting ? I could test with a single LDAP server, but I guess we should try with a primary and a backup server.