From: Tim Beale Date: Mon, 5 Nov 2018 01:30:14 +0000 (+1300) Subject: join: Fix join large-DB timeout against Windows X-Git-Tag: tdb-1.3.17~919 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02d41fea33e3ad521fbef2d4f00af2db35edd9d9;p=thirdparty%2Fsamba.git 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 Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/join.py b/python/samba/join.py index c2d92547d58..343b1a50934 100644 --- a/python/samba/join.py +++ b/python/samba/join.py @@ -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(),