X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/1e70f85bc1b5cebe658c167e7392e66a7ab440fc..d7d7b7b91dd75cec636fc144da7e27eed860f971:/src/src/spool_in.c diff --git a/src/src/spool_in.c b/src/src/spool_in.c index 77609a682..03379f092 100644 --- a/src/src/spool_in.c +++ b/src/src/spool_in.c @@ -1,10 +1,10 @@ -/* $Cambridge: exim/src/src/spool_in.c,v 1.7 2005/02/16 16:28:36 ph10 Exp $ */ +/* $Cambridge: exim/src/src/spool_in.c,v 1.15 2006/02/07 11:19:00 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2005 */ +/* Copyright (c) University of Cambridge 1995 - 2006 */ /* See the file NOTICE for conditions of use and distribution. */ /* Functions for reading spool files. When compiling for a utility (eximon), @@ -76,7 +76,7 @@ an open file descriptor (at least, I think that's the Cygwin story). On real Unix systems it doesn't make any difference as long as Exim is consistent in what it locks. */ -fcntl(deliver_datafile, F_SETFD, fcntl(deliver_datafile, F_GETFD) | +(void)fcntl(deliver_datafile, F_SETFD, fcntl(deliver_datafile, F_GETFD) | FD_CLOEXEC); lock_data.l_type = F_WRLCK; @@ -89,7 +89,7 @@ if (fcntl(deliver_datafile, F_SETLK, &lock_data) < 0) log_write(L_skip_delivery, LOG_MAIN, "Spool file is locked (another process is handling this message)"); - close(deliver_datafile); + (void)close(deliver_datafile); deliver_datafile = -1; errno = 0; return FALSE; @@ -236,7 +236,7 @@ uschar *p; one exception. DO NOT change the default value of dont_deliver, because it may be forced by an external setting. */ -for (n = 0; n < ACL_C_MAX + ACL_M_MAX; n++) acl_var[n] = NULL; +for (n = 0; n < ACL_CVARS + ACL_MVARS; n++) acl_var[n] = NULL; authenticated_id = NULL; authenticated_sender = NULL; @@ -278,6 +278,10 @@ bmi_run = 0; bmi_verdicts = NULL; #endif +#ifdef EXPERIMENTAL_DOMAINKEYS +dk_do_verify = 0; +#endif + #ifdef SUPPORT_TLS tls_certificate_verified = FALSE; tls_cipher = NULL; @@ -319,9 +323,10 @@ if (Ustrlen(big_buffer) != MESSAGE_ID_LENGTH + 3 || /* The next three lines in the header file are in a fixed format. The first contains the login, uid, and gid of the user who caused the file to be written. -The second contains the mail address of the message's sender, enclosed in <>. -The third contains the time the message was received, and the number of warning -messages for delivery delays that have been sent. */ +There are known cases where a negative gid is used, so we allow for both +negative uids and gids. The second contains the mail address of the message's +sender, enclosed in <>. The third contains the time the message was received, +and the number of warning messages for delivery delays that have been sent. */ if (Ufgets(big_buffer, big_buffer_size, f) == NULL) goto SPOOL_READ_ERROR; @@ -329,16 +334,16 @@ p = big_buffer + Ustrlen(big_buffer); while (p > big_buffer && isspace(p[-1])) p--; *p = 0; if (!isdigit(p[-1])) goto SPOOL_FORMAT_ERROR; -while (p > big_buffer && isdigit(p[-1])) p--; +while (p > big_buffer && (isdigit(p[-1]) || '-' == p[-1])) p--; gid = Uatoi(p); if (p <= big_buffer || *(--p) != ' ') goto SPOOL_FORMAT_ERROR; *p = 0; if (!isdigit(p[-1])) goto SPOOL_FORMAT_ERROR; -while (p > big_buffer && isdigit(p[-1])) p--; +while (p > big_buffer && (isdigit(p[-1]) || '-' == p[-1])) p--; uid = Uatoi(p); if (p <= big_buffer || *(--p) != ' ') goto SPOOL_FORMAT_ERROR; *p = 0; - + originator_login = string_copy(big_buffer); originator_uid = (uid_t)uid; originator_gid = (gid_t)gid; @@ -371,30 +376,62 @@ for (;;) { if (Ufgets(big_buffer, big_buffer_size, f) == NULL) goto SPOOL_READ_ERROR; if (big_buffer[0] != '-') break; - big_buffer[Ustrlen(big_buffer) - 1] = 0; + + /* For backward compatibility, we recognize "-acl", which was used before the + number of ACL variables changed. Its variable number is 0-9 for connection + variables, and 10-19 for message variables. */ + if (Ustrncmp(big_buffer, "-acl ", 5) == 0) { int index, count; if (sscanf(CS big_buffer + 5, "%d %d", &index, &count) != 2) goto SPOOL_FORMAT_ERROR; - /* Ignore if index too big - might be if a later release with more - variables built this spool file. */ - if (index < ACL_C_MAX + ACL_M_MAX) + acl_var[index] = store_get(count + 1); + if (fread(acl_var[index], 1, count+1, f) < count) goto SPOOL_READ_ERROR; + acl_var[index][count] = 0; + } + + /* Nowadays we use "-aclc" and "-aclm" for the different types of ACL + variable, because Exim may be built with different numbers of them. */ + + else if (Ustrncmp(big_buffer, "-aclc ", 6) == 0) + { + int index, count; + if (sscanf(CS big_buffer + 6, "%d %d", &index, &count) != 2) + goto SPOOL_FORMAT_ERROR; + if (index < ACL_CVARS) { acl_var[index] = store_get(count + 1); if (fread(acl_var[index], 1, count+1, f) < count) goto SPOOL_READ_ERROR; acl_var[index][count] = 0; } } + + else if (Ustrncmp(big_buffer, "-aclm ", 6) == 0) + { + int index, count; + if (sscanf(CS big_buffer + 6, "%d %d", &index, &count) != 2) + goto SPOOL_FORMAT_ERROR; + if (index < ACL_MVARS) + { + index += ACL_CVARS; + acl_var[index] = store_get(count + 1); + if (fread(acl_var[index], 1, count+1, f) < count) goto SPOOL_READ_ERROR; + acl_var[index][count] = 0; + } + } + + /* Other values */ + else if (Ustrcmp(big_buffer, "-local") == 0) sender_local = TRUE; else if (Ustrcmp(big_buffer, "-localerror") == 0) local_error_message = TRUE; else if (Ustrncmp(big_buffer, "-local_scan ", 12) == 0) local_scan_data = string_copy(big_buffer + 12); -#ifdef WITH_CONTENT_SCAN +#ifdef WITH_CONTENT_SCAN else if (Ustrncmp(big_buffer, "-spam_score_int ", 16) == 0) - spam_score_int = string_copy(big_buffer + 16); + spam_score_int = string_copy(big_buffer + 16); #endif #ifdef EXPERIMENTAL_BRIGHTMAIL else if (Ustrncmp(big_buffer, "-bmi_verdicts ", 14) == 0) @@ -443,18 +480,18 @@ for (;;) else if (Ustrncmp(big_buffer, "-host_address", 13) == 0) { - sender_host_port = host_extract_port(big_buffer + 14); + sender_host_port = host_address_extract_port(big_buffer + 14); sender_host_address = string_copy(big_buffer + 14); } else if (Ustrncmp(big_buffer, "-interface_address", 18) == 0) { - interface_port = host_extract_port(big_buffer + 19); + interface_port = host_address_extract_port(big_buffer + 19); interface_address = string_copy(big_buffer + 19); } else if (Ustrncmp(big_buffer, "-active_hostname", 16) == 0) - smtp_active_hostname = string_copy(big_buffer + 17); + smtp_active_hostname = string_copy(big_buffer + 17); else if (Ustrncmp(big_buffer, "-host_auth", 10) == 0) sender_host_authenticated = string_copy(big_buffer + 11); else if (Ustrncmp(big_buffer, "-host_name", 10) == 0) @@ -576,7 +613,7 @@ for (recipients_count = 0; recipients_count < rcount; recipients_count++) if (*p == ' ') { *p++ = 0; - sscanf(CS p, "%d,%d", &dummy, &pno); + (void)sscanf(CS p, "%d,%d", &dummy, &pno); } } @@ -585,7 +622,7 @@ for (recipients_count = 0; recipients_count < rcount; recipients_count++) else if (*p == ' ') { *p++ = 0; - sscanf(CS p, "%d", &pno); + (void)sscanf(CS p, "%d", &pno); } /* Handle current format Exim 4 spool files */ @@ -593,13 +630,13 @@ for (recipients_count = 0; recipients_count < rcount; recipients_count++) else if (*p == '#') { int flags; - sscanf(CS p+1, "%d", &flags); + (void)sscanf(CS p+1, "%d", &flags); if ((flags & 0x01) != 0) /* one_time data exists */ { int len; while (isdigit(*(--p)) || *p == ',' || *p == '-'); - sscanf(CS p+1, "%d,%d", &len, &pno); + (void)sscanf(CS p+1, "%d,%d", &len, &pno); *p = 0; if (len > 0) { @@ -635,8 +672,8 @@ while ((n = fgetc(f)) != EOF) int i; if (!isdigit(n)) goto SPOOL_FORMAT_ERROR; - ungetc(n, f); - fscanf(f, "%d%c ", &n, flag); + (void)ungetc(n, f); + (void)fscanf(f, "%d%c ", &n, flag); if (flag[0] != '*') message_size += n; /* Omit non-transmitted headers */ if (read_headers)