Samba 3.4 and 4 Merge into Franky

Developers of the free Samba server have packed the newest version 4 into the 3.4 tarball to form Franky.

The combined Samba branch can optionally be compiled as a merged build, instructions for which are available on the Samba Franky website. Apart from having to use "--enable-merged-build", 3.4 installation can proceed as usual.

The Samba 3.4 changelog lists the enhancements in 3.4. One of them is a change of the default "passdb" password backend to "tdbsam" (to allow more flexibility for per user settings), which nevertheless allows keeping with the previous "smbpasswd" or converting to the new one.