1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00

join: Fix join large-DB timeout against Windows

The LDAP connection can also timeout when trying to join a Windows DC
with a very large database. However, in this case Windows gives a
slightly different error message (NT_STATUS_CONNECTION_RESET instead of
NT_STATUS_CONNECTION_DISCONNECTED).

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13612

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Tim Beale
2018-11-05 14:30:14 +13:00
committed by Tim Beale
parent e355a6bc59
commit 02d41fea33

View File

@ -1031,7 +1031,8 @@ class DCJoinContext(object):
# if the connection was disconnected, then reconnect
if (enum == ldb.ERR_OPERATIONS_ERROR and
'NT_STATUS_CONNECTION_DISCONNECTED' in estr):
('NT_STATUS_CONNECTION_DISCONNECTED' in estr or
'NT_STATUS_CONNECTION_RESET' in estr)):
ctx.logger.warning("LDB connection disconnected. Reconnecting")
ctx.samdb = SamDB(url="ldap://%s" % ctx.server,
session_info=system_session(),