segfault fix merged from SAMBA_2_2