r23580: Merge bug fix for 4720 and Jeremy's winbindd_dual.c changes (still testing...