Le Monday 09 November 2009 16:51:54 Jakob Hirsch, vous avez écrit :
> S e r g e, 2009-11-09 16:21:
> > - if (bytestate & 3 != 0)
> > + if (bytestate & (3 != 0))
>
> um, no. You proably meant
>
> if ((bytestate & 3) != 0)
Thank you Jakob ;-)
Another
========= exim-4.70/src/dcc.c ===========
diff -urN exim-4.70/src/dcc.c exim-4.70.OK/src/dcc.c
--- exim-4.70/src/dcc.c 2009-10-14 20:39:24 +0200
+++ exim-4.70.OK/src/dcc.c 2009-11-09 16:58:44 +0100
@@ -329,7 +329,7 @@
Ustrncat(sendbuf, "\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1);
flushbuffer(sockfd, sendbuf);
DEBUG(D_acl)
- debug_printf("\n****************************\n", sendbuf);
+ debug_printf("\n****************************\n%s", sendbuf);
/* Clear the input buffer */
bzero(sendbuf, sizeof(sendbuf));
@@ -380,7 +380,7 @@
/* Let's read from the socket until there's nothing left to read */
bzero(recvbuf, sizeof(recvbuf));
- while(resp = read(sockfd, recvbuf, sizeof(recvbuf)-1) > 0) {
+ while((resp = read(sockfd, recvbuf, sizeof(recvbuf)-1)) > 0) {
/* How much did we get from the socket */
c = Ustrlen(recvbuf) + 1;
DEBUG(D_acl)
@@ -405,13 +405,13 @@
DEBUG(D_acl)
debug_printf("Overall result = A\treturning OK\n");
Ustrcpy(dcc_return_text, "Mail accepted by DCC");
- dcc_result = "A";
+ dcc_result = US"A";
retval = OK;
}
else if(recvbuf[i] == 'R') {
DEBUG(D_acl)
debug_printf("Overall result = R\treturning FAIL\n");
- dcc_result = "R";
+ dcc_result = US"R";
retval = FAIL;
if(sender_host_name) {
log_write(0, LOG_MAIN, "H=%s [%s] F=<%s>: rejected by DCC",
sender_host_name, sender_host_address, sender_address);
@@ -427,14 +427,14 @@
Ustrcpy(dcc_return_text, "Not all recipients accepted by DCC");
/* Since we're in an ACL we want a global result
* so we accept for all */
- dcc_result = "A";
+ dcc_result = US"A";
retval = OK;
}
else if(recvbuf[i] == 'G') {
DEBUG(D_acl)
debug_printf("Overall result = G\treturning FAIL\n");
Ustrcpy(dcc_return_text, "Greylisted by DCC");
- dcc_result = "G";
+ dcc_result = US"G";
retval = FAIL;
}
else if(recvbuf[i] == 'T') {
@@ -443,7 +443,7 @@
retval = DEFER;
log_write(0,LOG_MAIN,"Temporary error with DCC: %s\n",
recvbuf);
Ustrcpy(dcc_return_text, "Temporary error with DCC");
- dcc_result = "T";
+ dcc_result = US"T";
}
else {
DEBUG(D_acl)
@@ -451,7 +451,7 @@
retval = DEFER;
log_write(0,LOG_MAIN,"Unknown DCC response: %s\n", recvbuf);
Ustrcpy(dcc_return_text, "Unknown DCC response");
- dcc_result = "T";
+ dcc_result = US"T";
}
}
else {
@@ -517,7 +517,7 @@
/* check if we should add additional headers passed in acl_m_dcc_add_header
*/
if(dcc_direct_add_header) {
- if (((xtra_hdrs = expand_string("$acl_m_dcc_add_header")) != NULL) &&
(xtra_hdrs[0] != '\0')) {
+ if (((xtra_hdrs = expand_string(US"$acl_m_dcc_add_header")) != NULL) &&
(xtra_hdrs[0] != '\0')) {
Ustrncpy(dcc_xtra_hdrs, xtra_hdrs, sizeof(dcc_xtra_hdrs) - 2);
if (dcc_xtra_hdrs[Ustrlen(dcc_xtra_hdrs)-1] != '\n')
Ustrcat(dcc_xtra_hdrs, "\n");
========= exim-4.70/src/dcc.c ===========
* Now it still remains:
dcc.c:96: warning: unused variable 'pollfd'
dcc.c:94: warning: unused variable 'server'
dcc.c:93: warning: unused variable 'start'
dcc.c:92: warning: unused variable 'override'
dcc.c:91: warning: unused variable 'q'
dcc.c:91: warning: unused variable 'p'
dcc.c:90: warning: unused variable 'offset'
dcc.c:85: warning: unused variable 'dcc_rcpt'
dcc.c:62: warning: unused variable 'dcc_request'
dcc.c:61: warning: unused variable 'dcc_daemon_port'
dcc.c:59: warning: unused variable 'dcc_buffer'
dcc.c:58: warning: unused variable 'dcc_sock'
dcc.c:56: warning: unused variable 'mbox_size'
dcc.c:55: warning: unused variable 'user_name_buffer'
dcc.c:54: warning: unused variable 'body_begin'
dcc.c:53: warning: unused variable 'user_name'
dcc.c:100: warning: 'result' is used uninitialized in this function
dcc.c:156: warning: 'portnr' may be used uninitialized in this function
Regards,
-- S e r g e
