diff options
| author | Tim Beale <timbeale@catalyst.net.nz> | 2018-11-05 14:30:14 +1300 |
|---|---|---|
| committer | Tim Beale <timbeale@samba.org> | 2018-11-06 03:39:11 +0100 |
| commit | 02d41fea33e3ad521fbef2d4f00af2db35edd9d9 (patch) | |
| tree | 31b67e881c6a60191bf071fc2150831b41b5dcc5 /python | |
| parent | e355a6bc59624f9328a6dbf33b335c57e9c8e10f (diff) | |
| download | samba-02d41fea33e3ad521fbef2d4f00af2db35edd9d9.tar.gz | |
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>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/join.py | 3 |
1 files changed, 2 insertions, 1 deletions
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(), |