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/nsswitch/winbindd_ads.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/nsswitch/winbindd_ads.c')
-rw-r--r-- | source3/nsswitch/winbindd_ads.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c index c64359a224..ef3f0f8fc2 100644 --- a/source3/nsswitch/winbindd_ads.c +++ b/source3/nsswitch/winbindd_ads.c @@ -787,9 +787,13 @@ static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq) } rc = ads_USN(ads, seq); + if (!ADS_ERR_OK(rc)) { - /* its a dead connection */ - ads_destroy(&ads); + + /* its a dead connection ; don't destroy it + through since ads_USN() has already done + that indirectly */ + domain->private = NULL; } return ads_ntstatus(rc); @@ -910,8 +914,11 @@ static NTSTATUS domain_sid(struct winbindd_domain *domain, DOM_SID *sid) rc = ads_domain_sid(ads, sid); if (!ADS_ERR_OK(rc)) { - /* its a dead connection */ - ads_destroy(&ads); + + /* its a dead connection; don't destroy it though + since that has already been done indirectly + by ads_domain_sid() */ + domain->private = NULL; } |