I have been mucking around with the new releases and converting them to OpenVZ templates for my own use.
As part of the process I have been running apt-get upgrade. But with the Domain Controller, as part of the upgrade I am confronted with a screen that says:
"A new version of configuration file /etc/samba/smb.conf is availabe, but the version installed currently has been locally modified. What would you like to do about smb.conf?"
The I am presented with the following options:
- install new
- keep current
- diff threeway
- merge threeway
I am assuming that the local modifications are a custom TKL set.
What is the best method (ie the one most likely to work as desired and least likely to cause problems).
For your interest I have stuck with "keep current" for now but have yet to test my template.
 Same applies to TKL FileServer (and obviously any other appliance that uses Samba).