X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/416a0be6df0697848ca551dd3243b652e763792d..e1d04f48a45c9f8e8ff75610003048f8ead73219:/src/src/spam.c diff --git a/src/src/spam.c b/src/src/spam.c index 93c0a540d..d4b95b2f9 100644 --- a/src/src/spam.c +++ b/src/src/spam.c @@ -251,7 +251,7 @@ if (*spamd_address == '$') else spamd_address_work = spamd_address; -DEBUG(D_acl) debug_printf("spamd: addrlist '%s'\n", spamd_address_work); +DEBUG(D_acl) debug_printf_indent("spamd: addrlist '%s'\n", spamd_address_work); /* check if previous spamd_address was expanded and has changed. dump cached results if so */ if ( spam_ok @@ -295,7 +295,7 @@ start = time(NULL); unsigned args; uschar * s; - DEBUG(D_acl) debug_printf("spamd: addr entry '%s'\n", address); + DEBUG(D_acl) debug_printf_indent("spamd: addr entry '%s'\n", address); sd = (spamd_address_container *)store_get(sizeof(spamd_address_container)); for (sublist = address, args = 0, spamd_param_init(sd); @@ -303,7 +303,7 @@ start = time(NULL); args++ ) { - DEBUG(D_acl) debug_printf("spamd: addr parm '%s'\n", s); + DEBUG(D_acl) debug_printf_indent("spamd: addr parm '%s'\n", s); switch (args) { case 0: sd->hostspec = s; @@ -342,7 +342,7 @@ start = time(NULL); { uschar * errstr; - DEBUG(D_acl) debug_printf("spamd: trying server %s\n", sd->hostspec); + DEBUG(D_acl) debug_printf_indent("spamd: trying server %s\n", sd->hostspec); for (;;) { @@ -350,7 +350,7 @@ start = time(NULL); || sd->retry <= 0 ) break; - DEBUG(D_acl) debug_printf("spamd: server %s: retry conn\n", sd->hostspec); + DEBUG(D_acl) debug_printf_indent("spamd: server %s: retry conn\n", sd->hostspec); while (sd->retry > 0) sd->retry = sleep(sd->retry); } if (spamd_sock >= 0) @@ -414,12 +414,12 @@ if (wrote == -1) } /* now send the file */ -/* spamd sometimes accepts conections but doesn't read data off +/* spamd sometimes accepts connections but doesn't read data off * the connection. We make the file descriptor non-blocking so * that the write will only write sufficient data without blocking - * and we poll the desciptor to make sure that we can write without + * and we poll the descriptor to make sure that we can write without * blocking. Short writes are gracefully handled and if the whole - * trasaction takes too long it is aborted. + * transaction takes too long it is aborted. * Note: poll() is not supported in OSX 10.2 and is reported to be * broken in more recent versions (up to 10.4). */