Correctly handle the case where smtpgreeting exists (append ESMTP) as well as the case where it doesn't (display original Qpsmtpd greeting). 
Correctly handle the case where smtpgreeting exists (append ESMTP) as well as
the case where it doesn't (display original Qpsmtpd greeting). 

git-svn-id: 6e7a7971b1024e6b6028729f590d7800a6049a23@511 958fd67b-6ff1-0310-b445-bb7760255be9

gh/ghqp,gh/ghqp