Patches for check_smtp  [sf#1447609] [#632]