From: Christof Schmitt Date: Thu, 7 Jan 2016 20:27:49 +0000 (-0700) Subject: Revert "winbind: Retry after SESSION_EXPIRED error in ping-dc" X-Git-Url: http://git.samba.org/?p=obnox%2Fsamba%2Fsamba-obnox.git;a=commitdiff_plain;h=6f3656c47d8ae6a3ac10591ffd7a60797775b469 Revert "winbind: Retry after SESSION_EXPIRED error in ping-dc" This reverts commit a2670f15dea27c10e3827216adf572f9c3894f85. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11670 cm_connect_netlogon now handles the retry for an expired session. Signed-off-by: Christof Schmitt Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Wed Jan 13 03:35:57 CET 2016 on sn-devel-144 --- diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c index 44e4842ec22..cdd9bbd6168 100644 --- a/source3/winbindd/winbindd_dual_srv.c +++ b/source3/winbindd/winbindd_dual_srv.c @@ -741,14 +741,6 @@ NTSTATUS _wbint_PingDc(struct pipes_struct *p, struct wbint_PingDc *r) reconnect: status = cm_connect_netlogon(domain, &netlogon_pipe); - if (NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_SESSION_EXPIRED)) { - /* - * Retry to open new connection with new kerberos ticket. - */ - invalidate_cm_connection(domain); - status = cm_connect_netlogon(domain, &netlogon_pipe); - } - reset_cm_connection_on_error(domain, status); if (!NT_STATUS_IS_OK(status)) { DEBUG(3, ("could not open handle to NETLOGON pipe: %s\n",