Solve some of the conflict between Samba3 and Samba4 push_string