![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 2c03874b1f332020e96f6abb42e2ba9d4eac4708..d8b90597c8ad3489a688faefab2ea6b63ede2447 100644 (file)
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
#include "netutils.h"
#include "utils.h"
-#define PROGNAME "check_smtp"
+const char *progname = "check_smtp";
#define SMTP_PORT 25
#define SMTP_EXPECT "220"
+#define SMTP_HELO "HELO "
+
/* sendmail will syslog a "NOQUEUE" error if session does not attempt
* to do something useful. This can be prevented by giving a command
* even if syntax is illegal (MAIL requires a FROM:<...> argument)
* You can disable sending DUMMYCMD by undefining SMTP_USE_DUMMYCMD.
+ *
+ * According to rfc821 you can include a null reversepath in the from command
+ * - but a log message is generated on the smtp server.
+ *
+ * Use the -f option to provide a FROM address
*/
-#define SMTP_DUMMYCMD "MAIL\n"
+
+#define SMTP_DUMMYCMD "MAIL "
#define SMTP_USE_DUMMYCMD 1
-#define SMTP_QUIT "QUIT\n"
+#define SMTP_QUIT "QUIT\r\n"
int process_arguments (int, char **);
-int call_getopt (int, char **);
int validate_arguments (void);
-int check_disk (int usp, int free_disk);
void print_help (void);
void print_usage (void);
int server_port = SMTP_PORT;
char *server_address = NULL;
char *server_expect = NULL;
+char *from_arg = " ";
int warning_time = 0;
int check_warning_time = FALSE;
int critical_time = 0;
int sd;
int result;
char buffer[MAX_INPUT_BUFFER] = "";
+ char *from_str = NULL;
+ char *helocmd = NULL;
if (process_arguments (argc, argv) != OK)
usage ("Invalid command arguments supplied\n");
+ /* initialize the HELO command with the localhostname */
+#ifndef HOST_MAX_BYTES
+#define HOST_MAX_BYTES 255
+#endif
+ helocmd = malloc (HOST_MAX_BYTES);
+ gethostname(helocmd, HOST_MAX_BYTES);
+ asprintf (&helocmd, "%s%s%s", SMTP_HELO, helocmd, "\r\n");
+
+ /* initialize the MAIL command with optional FROM command */
+ asprintf (&from_str, "%sFROM: %s%s", SMTP_DUMMYCMD, from_arg, "\r\n");
+
+ if (verbose == TRUE)
+ printf ("FROMCMD: %s\n", from_str);
+
/* initialize alarm signal handling */
signal (SIGALRM, socket_timeout_alarm_handler);
}
/* close the connection */
+
+ /* first send the HELO command */
+ send(sd, helocmd, strlen(helocmd), 0);
+
+ /* allow for response to helo command to reach us */
+ recv(sd, buffer, MAX_INPUT_BUFFER-1, 0);
+
#ifdef SMTP_USE_DUMMYCMD
- send(sd,SMTP_DUMMYCMD,strlen(SMTP_DUMMYCMD),0);
- /* allow for response to DUMMYCMD to reach us */
- recv(sd,buffer,MAX_INPUT_BUFFER-1,0);
+ send(sd, from_str, strlen(from_str), 0);
+
+ /* allow for response to DUMMYCMD to reach us */
+ recv(sd, buffer, MAX_INPUT_BUFFER-1, 0);
+
+ if (verbose == TRUE)
+ printf("DUMMYCMD: %s\n%s\n",from_str,buffer);
#endif /* SMTP_USE_DUMMYCMD */
+ /* tell the server we're done */
send (sd, SMTP_QUIT, strlen (SMTP_QUIT), 0);
+
+ /* finally close the connection */
close (sd);
}
{
int c;
- if (argc < 2)
- return ERROR;
-
- for (c = 1; c < argc; c++) {
- if (strcmp ("-to", argv[c]) == 0)
- strcpy (argv[c], "-t");
- else if (strcmp ("-wt", argv[c]) == 0)
- strcpy (argv[c], "-w");
- else if (strcmp ("-ct", argv[c]) == 0)
- strcpy (argv[c], "-c");
- }
-
-
-
- c = 0;
- while ((c += (call_getopt (argc - c, &argv[c]))) < argc) {
-
- if (is_option (argv[c]))
- continue;
-
- if (server_address == NULL) {
- if (is_host (argv[c])) {
- server_address = argv[c];
- }
- else {
- usage ("Invalid host name");
- }
- }
- }
-
- if (server_address == NULL)
- server_address = strscpy (NULL, "127.0.0.1");
-
- if (server_expect == NULL)
- server_expect = strscpy (NULL, SMTP_EXPECT);
-
- return validate_arguments ();
-}
-
-
-
-
-
-
-int
-call_getopt (int argc, char **argv)
-{
- int c, i = 0;
-
#ifdef HAVE_GETOPT_H
int option_index = 0;
static struct option long_options[] = {
{"expect", required_argument, 0, 'e'},
{"critical", required_argument, 0, 'c'},
{"warning", required_argument, 0, 'w'},
- {"port", required_argument, 0, 'P'},
+ {"port", required_argument, 0, 'p'},
+ {"from", required_argument, 0, 'f'},
{"verbose", no_argument, 0, 'v'},
{"version", no_argument, 0, 'V'},
{"help", no_argument, 0, 'h'},
};
#endif
+ if (argc < 2)
+ return ERROR;
+
+ for (c = 1; c < argc; c++) {
+ if (strcmp ("-to", argv[c]) == 0)
+ strcpy (argv[c], "-t");
+ else if (strcmp ("-wt", argv[c]) == 0)
+ strcpy (argv[c], "-w");
+ else if (strcmp ("-ct", argv[c]) == 0)
+ strcpy (argv[c], "-c");
+ }
+
while (1) {
#ifdef HAVE_GETOPT_H
c =
- getopt_long (argc, argv, "+hVvt:p:e:c:w:H:", long_options,
+ getopt_long (argc, argv, "+hVvt:p:f:e:c:w:H:", long_options,
&option_index);
#else
- c = getopt (argc, argv, "+?hVvt:p:e:c:w:H:");
+ c = getopt (argc, argv, "+?hVvt:p:f:e:c:w:H:");
#endif
-
- i++;
-
- if (c == -1 || c == EOF || c == 1)
+ if (c == -1 || c == EOF)
break;
- switch (c) {
- case 't':
- case 'p':
- case 'e':
- case 'c':
- case 'w':
- case 'H':
- i++;
- }
-
switch (c) {
case 'H': /* hostname */
if (is_host (optarg)) {
usage ("Server port must be a positive integer\n");
}
break;
- case 'e': /* username */
+ case 'f': /* from argument */
+ from_arg = optarg;
+ break;
+ case 'e': /* server expect string on 220 */
server_expect = optarg;
break;
case 'c': /* critical time threshold */
}
break;
case 'V': /* version */
- print_revision (PROGNAME, "$Revision$");
+ print_revision (progname, "$Revision$");
exit (STATE_OK);
case 'h': /* help */
print_help ();
usage ("Invalid argument\n");
}
}
- return i;
+
+ c = optind;
+ if (server_address == NULL) {
+ if (argv[c]) {
+ if (is_host (argv[c]))
+ server_address = argv[c];
+ else
+ usage ("Invalid host name");
+ }
+ else {
+ asprintf (&server_address, "127.0.0.1");
+ }
+ }
+
+ if (server_expect == NULL)
+ asprintf (&server_expect, SMTP_EXPECT);
+
+ return validate_arguments ();
}
void
print_help (void)
{
- print_revision (PROGNAME, "$Revision$");
+ print_revision (progname, "$Revision$");
printf
("Copyright (c) 2000 Ethan Galstad/Karl DeBisschop\n\n"
"This plugin test the SMTP service on the specified host.\n\n");
" Make connection on the indicated port (default: %d)\n"
" -e, --expect=STRING\n"
" String to expect in first line of server response (default: %s)\n"
+ " -f, --from=STRING\n"
+ " from address to include in MAIL command (default NULL, Exchange2000 requires one)\n"
" -w, --warning=INTEGER\n"
" Seconds necessary to result in a warning status\n"
" -c, --critical=INTEGER\n"
print_usage (void)
{
printf
- ("Usage: %s -H host [-e expect] [-p port] [-w warn] [-c crit] [-t timeout] [-v]\n"
+ ("Usage: %s -H host [-e expect] [-p port] [-f from addr] [-w warn] [-c crit] [-t timeout] [-v]\n"
" %s --help\n"
- " %s --version\n", PROGNAME, PROGNAME, PROGNAME);
+ " %s --version\n", progname, progname, progname);
}