diff options
author | Gerald Carter <jerry@samba.org> | 2003-10-03 21:43:09 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2003-10-03 21:43:09 +0000 |
commit | 48958b0105dce32888497e79106e08c70af7e3ef (patch) | |
tree | 387d64cac98b02025c9cb4f6df1397ec65c327fb /source3/libads/ldap_utils.c | |
parent | c81c09d66ff4ed5c524312f73540862ded3335d2 (diff) | |
download | samba-48958b0105dce32888497e79106e08c70af7e3ef.tar.gz samba-48958b0105dce32888497e79106e08c70af7e3ef.tar.bz2 samba-48958b0105dce32888497e79106e08c70af7e3ef.zip |
don't call ads_destroy() twice; fixes segfault in winbindd when DC goes down; bug 437
(This used to be commit 1cfbd92404270e0c67a3b295fc9cf461b29d3503)
Diffstat (limited to 'source3/libads/ldap_utils.c')
-rw-r--r-- | source3/libads/ldap_utils.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/libads/ldap_utils.c b/source3/libads/ldap_utils.c index 1fa9ebfc97..4142bceabc 100644 --- a/source3/libads/ldap_utils.c +++ b/source3/libads/ldap_utils.c @@ -54,15 +54,20 @@ ADS_STATUS ads_do_search_retry(ADS_STRUCT *ads, const char *bind_path, int scope return status; } - if (*res) ads_msgfree(ads, *res); + if (*res) + ads_msgfree(ads, *res); *res = NULL; + DEBUG(3,("Reopening ads connection to realm '%s' after error %s\n", ads->config.realm, ads_errstr(status))); + if (ads->ld) { ldap_unbind(ads->ld); } + ads->ld = NULL; status = ads_connect(ads); + if (!ADS_ERR_OK(status)) { DEBUG(1,("ads_search_retry: failed to reconnect (%s)\n", ads_errstr(status))); |