r21176: merged va_end() changes from Samba4