Fix botched merge of Rong Zeng's MSPAC change.

In addition, fix cmake checks to ensure a sufficiently recent
wbclient interface (Samba4).  Add a SAMBA4_PREFIX cmake param to
help with this.

Signed-off-by: Matt Benjamin <matt@linuxbox.com>