Imported Upstream version 1.4.16_pre1
This commit is contained in:
parent
047baae1ca
commit
212b4b8677
69 changed files with 10803 additions and 2698 deletions
|
@ -114,6 +114,7 @@ enum {
|
|||
TCP_PROTOCOL = 1,
|
||||
UDP_PROTOCOL = 2,
|
||||
};
|
||||
int ignore_send_quit_failure = FALSE;
|
||||
|
||||
|
||||
int
|
||||
|
@ -129,6 +130,9 @@ main (int argc, char **argv)
|
|||
char *error_msg = "";
|
||||
struct timeval tv;
|
||||
|
||||
/* Catch pipe errors in read/write - sometimes occurs when writing QUIT */
|
||||
(void) signal (SIGPIPE, SIG_IGN);
|
||||
|
||||
setlocale (LC_ALL, "");
|
||||
bindtextdomain (PACKAGE, LOCALEDIR);
|
||||
textdomain (PACKAGE);
|
||||
|
@ -183,7 +187,7 @@ main (int argc, char **argv)
|
|||
/* return a WARNING status if we couldn't read any data */
|
||||
if (recvlines(buffer, MAX_INPUT_BUFFER) <= 0) {
|
||||
printf (_("recv() failed\n"));
|
||||
result = STATE_WARNING;
|
||||
return STATE_WARNING;
|
||||
}
|
||||
else {
|
||||
if (verbose)
|
||||
|
@ -197,7 +201,7 @@ main (int argc, char **argv)
|
|||
else
|
||||
printf (_("Invalid SMTP response received from host on port %d: %s\n"),
|
||||
server_port, buffer);
|
||||
result = STATE_WARNING;
|
||||
return STATE_WARNING;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -272,9 +276,6 @@ main (int argc, char **argv)
|
|||
# ifdef USE_OPENSSL
|
||||
if ( check_cert ) {
|
||||
result = np_net_ssl_check_cert(days_till_exp);
|
||||
if(result != STATE_OK){
|
||||
printf ("%s\n", _("CRITICAL - Cannot retrieve server certificate."));
|
||||
}
|
||||
my_close();
|
||||
return result;
|
||||
}
|
||||
|
@ -476,6 +477,7 @@ process_arguments (int argc, char **argv)
|
|||
{"help", no_argument, 0, 'h'},
|
||||
{"starttls",no_argument,0,'S'},
|
||||
{"certificate",required_argument,0,'D'},
|
||||
{"ignore-quit-failure",no_argument,0,'q'},
|
||||
{0, 0, 0, 0}
|
||||
};
|
||||
|
||||
|
@ -492,7 +494,7 @@ process_arguments (int argc, char **argv)
|
|||
}
|
||||
|
||||
while (1) {
|
||||
c = getopt_long (argc, argv, "+hVv46t:p:f:e:c:w:H:C:R:SD:F:A:U:P:",
|
||||
c = getopt_long (argc, argv, "+hVv46t:p:f:e:c:w:H:C:R:SD:F:A:U:P:q",
|
||||
longopts, &option);
|
||||
|
||||
if (c == -1 || c == EOF)
|
||||
|
@ -579,6 +581,9 @@ process_arguments (int argc, char **argv)
|
|||
case 'v': /* verbose */
|
||||
verbose++;
|
||||
break;
|
||||
case 'q':
|
||||
ignore_send_quit_failure++; /* ignore problem sending QUIT */
|
||||
break;
|
||||
case 't': /* timeout */
|
||||
if (is_intnonneg (optarg)) {
|
||||
socket_timeout = atoi (optarg);
|
||||
|
@ -662,8 +667,20 @@ void
|
|||
smtp_quit(void)
|
||||
{
|
||||
int bytes;
|
||||
int n;
|
||||
|
||||
n = my_send(SMTP_QUIT, strlen(SMTP_QUIT));
|
||||
if(n < 0) {
|
||||
if(ignore_send_quit_failure) {
|
||||
if(verbose) {
|
||||
printf(_("Connection closed by server before sending QUIT command\n"));
|
||||
}
|
||||
return;
|
||||
}
|
||||
die (STATE_UNKNOWN,
|
||||
_("Connection closed by server before sending QUIT command\n"));
|
||||
}
|
||||
|
||||
my_send(SMTP_QUIT, strlen(SMTP_QUIT));
|
||||
if (verbose)
|
||||
printf(_("sent %s\n"), "QUIT");
|
||||
|
||||
|
@ -797,7 +814,9 @@ print_help (void)
|
|||
printf (" %s\n", _("SMTP AUTH username"));
|
||||
printf (" %s\n", "-P, --authpass=STRING");
|
||||
printf (" %s\n", _("SMTP AUTH password"));
|
||||
|
||||
printf (" %s\n", "-q, --ignore-quit-failure");
|
||||
printf (" %s\n", _("Ignore failure when sending QUIT command to server"));
|
||||
|
||||
printf (UT_WARN_CRIT);
|
||||
|
||||
printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
|
||||
|
@ -821,6 +840,6 @@ print_usage (void)
|
|||
printf ("%s\n", _("Usage:"));
|
||||
printf ("%s -H host [-p port] [-e expect] [-C command] [-f from addr]", progname);
|
||||
printf ("[-A authtype -U authuser -P authpass] [-w warn] [-c crit] [-t timeout]\n");
|
||||
printf ("[-F fqdn] [-S] [-D days] [-v] [-4|-6]\n");
|
||||
printf ("[-F fqdn] [-S] [-D days] [-v] [-4|-6] [-q]\n");
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue