s3-waf: Get winbindd to build again with current master