r12263: missed merges for 3.0.21 (patch from brian and derrell's libsmbclient fixes