|
|
@ -699,7 +699,7 @@ main(argc, argv)
|
|
|
|
if (smtp) {
|
|
|
|
if (smtp) {
|
|
|
|
sendline = "QUIT\r\n"; /* Surprises some SMTP servers which log a
|
|
|
|
sendline = "QUIT\r\n"; /* Surprises some SMTP servers which log a
|
|
|
|
* frightening NOQUEUE. Anyone knows better?
|
|
|
|
* frightening NOQUEUE. Anyone knows better?
|
|
|
|
* * * * * * See bug #1512776 */
|
|
|
|
* See bug #1512776 */
|
|
|
|
} else
|
|
|
|
} else
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#ifdef ICP
|
|
|
|
#ifdef ICP
|
|
|
@ -1374,7 +1374,9 @@ main(argc, argv)
|
|
|
|
(void) gettimeofday(&newtv, (struct timezone *) NULL);
|
|
|
|
(void) gettimeofday(&newtv, (struct timezone *) NULL);
|
|
|
|
temp = newtv;
|
|
|
|
temp = newtv;
|
|
|
|
tvsub(&temp, &oldtv);
|
|
|
|
tvsub(&temp, &oldtv);
|
|
|
|
if (!timeout_flag) {
|
|
|
|
if (!timeout_flag && (!plugin || plugin_result == 0)) { /* If it
|
|
|
|
|
|
|
|
* worked...
|
|
|
|
|
|
|
|
*/
|
|
|
|
tvadd(&total, &temp);
|
|
|
|
tvadd(&total, &temp);
|
|
|
|
|
|
|
|
|
|
|
|
/* Check */
|
|
|
|
/* Check */
|
|
|
@ -1431,8 +1433,7 @@ main(argc, argv)
|
|
|
|
results[i - 1].timevalue = measured;
|
|
|
|
results[i - 1].timevalue = measured;
|
|
|
|
else
|
|
|
|
else
|
|
|
|
results[i - 1].timevalue = newtv;
|
|
|
|
results[i - 1].timevalue = newtv;
|
|
|
|
if (!plugin || (plugin_result == 0))
|
|
|
|
successes++;
|
|
|
|
successes++;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (number > 1) {
|
|
|
|
if (number > 1) {
|
|
|
|
#ifdef OPENSSL
|
|
|
|
#ifdef OPENSSL
|
|
|
|