diff options
| author | Gerald Carter <jerry@samba.org> | 2006-05-24 14:11:27 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2006-05-24 14:11:27 +0000 |
| commit | f83b22a4ac79ceb6c558a88e7f5344d100806c2b (patch) | |
| tree | e7550c83dcfa6f78599da11d8ed7719247a34119 | |
| parent | f15942db1b478afbdb4de8d11151366abc66bfd1 (diff) | |
| download | samba-f83b22a4ac79ceb6c558a88e7f5344d100806c2b.tar.gz | |
r15860: grab r15845 from vl (fix crash in child winbindd process
| -rw-r--r-- | WHATSNEW.txt | 2 | ||||
| -rw-r--r-- | source/nsswitch/winbindd_cm.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 383c6519ea7..1fb9c413874 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -187,6 +187,8 @@ o Volker Lendecke <vl@samba.org> * BUG 3435: Fix 'msdfs root = yes' in [homes]. * Instruct winbindd to find a trusted DC on its own when runing on a Samba DC. + * Fix segv in child winbindd processes caused by a failed tconX + to the DC. o Jim McDonough <jmcd@us.ibm.com> diff --git a/source/nsswitch/winbindd_cm.c b/source/nsswitch/winbindd_cm.c index 6322a33c029..c9e970c13cd 100644 --- a/source/nsswitch/winbindd_cm.c +++ b/source/nsswitch/winbindd_cm.c @@ -372,6 +372,7 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain, result = NT_STATUS_UNSUCCESSFUL; cli_shutdown(*cli); + *cli = NULL; goto done; } |