Fixed broken HELO cmd (Enrico Scholz - 1675279)

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1630 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/NEWS b/NEWS
index 184d4ec2610f45b4bb5f16f3f4498badb960a2bb..ee0ac0e47dcb89330c09c3063efaab5e3a78d747 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ This file documents the major additions and syntax changes between releases.
 1.4.7 ??
        check_procs uses /usr/ucb/ps if available - fixes pst3 problems on Solaris
        Fixed MKINSTALLDIRS problem in po/
+       Fixed broken HELO in check_smtp
        Root plugins installed with world executable
        ./configure now detects if possible to compile check_mysql
        check_sybase from contrib now maintained in NagiosExchange

diff --git a/THANKS.in b/THANKS.in
index 1022646817cc56434bf4f757582f222d59b76f8b..98b86795b9029166cf3f0d8b9fc29869d360c687 100644 (file)
--- a/THANKS.in
+++ b/THANKS.in
@@ -210,3 +210,4 @@ Chris Grim
 Nobuhiro Ban
 Ville Mattila
 Lars Stavholm
+Enrico Scholz

diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index a7ba45a1c82ac4386bdc07f70376d55171599006..6987e1722d5a267bebec460e05cd47924a4b6d49 100644 (file)
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -179,7 +179,7 @@ main (int argc, char **argv)
        if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
-       /* initialize the HELO command with the localhostname */
+       /* If localhostname not set on command line, use gethostname to set */
        if(! localhostname){
                localhostname = malloc (HOST_MAX_BYTES);
                if(!localhostname){
@@ -190,13 +190,11 @@ main (int argc, char **argv)
                        printf(_("gethostname() failed!\n"));
                        return STATE_CRITICAL;
                }
-       } else {
-               helocmd = localhostname;
        }
        if(use_ehlo)
-               asprintf (&helocmd, "%s%s%s", SMTP_EHLO, helocmd, "\r\n");
+               asprintf (&helocmd, "%s%s%s", SMTP_EHLO, localhostname, "\r\n");
        else
-               asprintf (&helocmd, "%s%s%s", SMTP_HELO, helocmd, "\r\n");
+               asprintf (&helocmd, "%s%s%s", SMTP_HELO, localhostname, "\r\n");
 
        if (verbose)
                printf("HELOCMD: %s", helocmd);