X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fdcc.c;h=4c86c092b0cbab6dacaf332c9d9c3aace30abad4;hb=59a93276e38d2d8ae297a9581a5388a475c209c1;hp=1841e733d161cd54303fea462ea9b7932a5801f7;hpb=41313d92e0f157dacfa758993e7fc76e291b0415;p=exim.git diff --git a/src/src/dcc.c b/src/src/dcc.c index 1841e733d..4c86c092b 100644 --- a/src/src/dcc.c +++ b/src/src/dcc.c @@ -7,7 +7,7 @@ * wbreyha@gmx.net * See the file NOTICE for conditions of use and distribution. * - * Copyright (c) The Exim Maintainers 2015 - 2016 + * Copyright (c) The Exim Maintainers 2015 - 2018 */ /* This patch is based on code from Tom Kistners exiscan (ACL integration) and @@ -60,7 +60,7 @@ dcc_process(uschar **listptr) uschar *override_client_ip = NULL; /* from local_scan */ - int i, j, k, c, retval, sockfd, resp, line; + int j, k, c, retval, sockfd, resp, line; unsigned int portnr; struct sockaddr_un serv_addr; struct sockaddr_in serv_addr_in; @@ -72,7 +72,6 @@ dcc_process(uschar **listptr) uschar sendbuf[4096]; uschar recvbuf[4096]; uschar dcc_return_text[1024]; - uschar message_subdir[2]; struct header_line *dcchdr; uschar *dcc_acl_options; uschar dcc_acl_options_buffer[10]; @@ -98,11 +97,10 @@ dcc_process(uschar **listptr) return dcc_rc; /* open the spooled body */ - message_subdir[1] = '\0'; - for (i = 0; i < 2; i++) + for (int i = 0; i < 2; i++) { - message_subdir[0] = split_spool_directory == (i == 0) ? message_id[5] : 0; - + uschar message_subdir[2]; + set_subdir_str(message_subdir, message_id, i); if ((data_file = Ufopen( spool_fname(US"input", message_subdir, message_id, US"-D"), "rb"))) @@ -156,11 +154,11 @@ dcc_process(uschar **listptr) debug_printf("DCC: Client IP (default): %s\n", client_ip); } /* strncat(opts, my_request, strlen(my_request)); */ - Ustrcat(opts, "\n"); + Ustrcat(opts, US"\n"); Ustrncat(opts, client_ip, sizeof(opts)-Ustrlen(opts)-1); - Ustrncat(opts, "\nHELO ", sizeof(opts)-Ustrlen(opts)-1); + Ustrncat(opts, US"\nHELO ", sizeof(opts)-Ustrlen(opts)-1); Ustrncat(opts, dcc_helo_option, sizeof(opts)-Ustrlen(opts)-2); - Ustrcat(opts, "\n"); + Ustrcat(opts, US"\n"); /* initialize the other variables */ dcchdr = header_list; @@ -176,8 +174,8 @@ dcc_process(uschar **listptr) if (Ustrlen(sender_address) > 0) Ustrncpy(from, sender_address, sizeof(from)); else - Ustrncpy(from, "<>", sizeof(from)); - Ustrncat(from, "\n", sizeof(from)-Ustrlen(from)-1); + Ustrncpy(from, US"<>", sizeof(from)); + Ustrncat(from, US"\n", sizeof(from)-Ustrlen(from)-1); /************************************** * Now creating the socket connection * @@ -185,10 +183,10 @@ dcc_process(uschar **listptr) /* If sockip contains an ip, we use a tcp socket, otherwise a UNIX socket */ if(Ustrcmp(sockip, "")){ - ipaddress = gethostbyname((char *)sockip); - bzero((char *) &serv_addr_in, sizeof(serv_addr_in)); + ipaddress = gethostbyname(CS sockip); + bzero(CS &serv_addr_in, sizeof(serv_addr_in)); serv_addr_in.sin_family = AF_INET; - bcopy((char *)ipaddress->h_addr, (char *)&serv_addr_in.sin_addr.s_addr, ipaddress->h_length); + bcopy(CS ipaddress->h_addr, CS &serv_addr_in.sin_addr.s_addr, ipaddress->h_length); serv_addr_in.sin_port = htons(portnr); if ((sockfd = socket(AF_INET, SOCK_STREAM,0)) < 0){ DEBUG(D_acl) @@ -211,7 +209,7 @@ dcc_process(uschar **listptr) /* connecting to the dccifd UNIX socket */ bzero(&serv_addr, sizeof(serv_addr)); serv_addr.sun_family = AF_UNIX; - Ustrncpy(serv_addr.sun_path, sockpath, sizeof(serv_addr.sun_path)); + Ustrncpy(US serv_addr.sun_path, sockpath, sizeof(serv_addr.sun_path)); if ((sockfd = socket(AF_UNIX, SOCK_STREAM,0)) < 0){ DEBUG(D_acl) debug_printf("DCC: Creating UNIX socket connection failed: %s\n", strerror(errno)); @@ -244,7 +242,7 @@ dcc_process(uschar **listptr) } /* let's send each of the recipients to dccifd */ - for (i = 0; i < recipients_count; i++){ + for (int i = 0; i < recipients_count; i++){ DEBUG(D_acl) debug_printf("DCC: recipient = %s\n",recipients_list[i].address); if(Ustrlen(sendbuf) + Ustrlen(recipients_list[i].address) > sizeof(sendbuf)) @@ -255,10 +253,10 @@ dcc_process(uschar **listptr) bzero(sendbuf, sizeof(sendbuf)); } Ustrncat(sendbuf, recipients_list[i].address, sizeof(sendbuf)-Ustrlen(sendbuf)-1); - Ustrncat(sendbuf, "\r\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1); + Ustrncat(sendbuf, US"\r\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1); } /* send a blank line between options and message */ - Ustrncat(sendbuf, "\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1); + Ustrncat(sendbuf, US"\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1); /* Now we send the input buffer */ DEBUG(D_acl) debug_printf("DCC: %s\nDCC: ****************************\n", sendbuf); @@ -281,7 +279,7 @@ dcc_process(uschar **listptr) j = 0; while(j < dcchdr->slen) { - for(i = 0; i < sizeof(sendbuf)-2; i++) { + for(int i = 0; i < sizeof(sendbuf)-2; i++) { sendbuf[i] = dcchdr->text[j]; j++; } @@ -297,8 +295,8 @@ dcc_process(uschar **listptr) } } - /* a blank line seperates header from body */ - Ustrncat(sendbuf, "\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1); + /* a blank line separates header from body */ + Ustrncat(sendbuf, US"\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1); flushbuffer(sockfd, sendbuf); DEBUG(D_acl) debug_printf("\nDCC: ****************************\n%s", sendbuf); @@ -359,12 +357,11 @@ dcc_process(uschar **listptr) debug_printf("DCC: Length of the output buffer is: %d\nDCC: Output buffer is:\nDCC: ------------\nDCC: %s\nDCC: -----------\n", c, recvbuf); /* Now let's read each character and see what we've got */ - for(i = 0; i < c; i++) { + for(int i = 0; i < c; i++) { /* First check if we reached the end of the line and * then increment the line counter */ - if(recvbuf[i] == '\n') { + if(recvbuf[i] == '\n') line++; - } else { /* The first character of the first line is the * overall response. If there's another character @@ -376,7 +373,7 @@ dcc_process(uschar **listptr) if(recvbuf[i] == 'A') { DEBUG(D_acl) debug_printf("DCC: Overall result = A\treturning OK\n"); - Ustrcpy(dcc_return_text, "Mail accepted by DCC"); + Ustrcpy(dcc_return_text, US"Mail accepted by DCC"); dcc_result = US"A"; retval = OK; } @@ -396,7 +393,7 @@ dcc_process(uschar **listptr) else if(recvbuf[i] == 'S') { DEBUG(D_acl) debug_printf("DCC: Overall result = S\treturning OK\n"); - Ustrcpy(dcc_return_text, "Not all recipients accepted by DCC"); + Ustrcpy(dcc_return_text, US"Not all recipients accepted by DCC"); /* Since we're in an ACL we want a global result * so we accept for all */ dcc_result = US"A"; @@ -405,7 +402,7 @@ dcc_process(uschar **listptr) else if(recvbuf[i] == 'G') { DEBUG(D_acl) debug_printf("DCC: Overall result = G\treturning FAIL\n"); - Ustrcpy(dcc_return_text, "Greylisted by DCC"); + Ustrcpy(dcc_return_text, US"Greylisted by DCC"); dcc_result = US"G"; retval = FAIL; } @@ -414,7 +411,7 @@ dcc_process(uschar **listptr) debug_printf("DCC: Overall result = T\treturning DEFER\n"); retval = DEFER; log_write(0,LOG_MAIN,"Temporary error with DCC: %s\n", recvbuf); - Ustrcpy(dcc_return_text, "Temporary error with DCC"); + Ustrcpy(dcc_return_text, US"Temporary error with DCC"); dcc_result = US"T"; } else { @@ -422,7 +419,7 @@ dcc_process(uschar **listptr) debug_printf("DCC: Overall result = something else\treturning DEFER\n"); retval = DEFER; log_write(0,LOG_MAIN,"Unknown DCC response: %s\n", recvbuf); - Ustrcpy(dcc_return_text, "Unknown DCC response"); + Ustrcpy(dcc_return_text, US"Unknown DCC response"); dcc_result = US"T"; } } @@ -492,7 +489,7 @@ dcc_process(uschar **listptr) 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"); + Ustrcat(dcc_xtra_hdrs, US"\n"); header_add(' ', "%s", dcc_xtra_hdrs); DEBUG(D_acl) debug_printf("DCC: adding additional headers in $acl_m_dcc_add_header: %s", dcc_xtra_hdrs);