if (rr->type == T_TXT && rr->size > 3)
{
store_free_dns_answer(dnsa);
- return string_copyn_taint(US rr->data, rr->size, TRUE);
+ return string_copyn_taint(US rr->data, rr->size, GET_TAINTED);
}
store_free_dns_answer(dnsa);
return NULL;
message_id = US exim_str_fail_toolong(argv[msg_action_arg], MESSAGE_ID_LENGTH, "message-id");
/* Checking the length of the ID is sufficient to validate it.
Get an untainted version so file opens can be done. */
- message_id = string_copy_taint(message_id, FALSE);
+ message_id = string_copy_taint(message_id, GET_UNTAINTED);
spoolname = string_sprintf("%s-H", message_id);
if ((deliver_datafile = spool_open_datafile(message_id)) < 0)
{
/* Since the filename exists in the filesystem, we can return a
non-tainted result. */
- *result = string_copy_taint(flags & RET_FULL ? filename : keystring, FALSE);
+ *result = string_copy_taint(flags & RET_FULL ? filename : keystring, GET_UNTAINTED);
return OK;
}
addr->prefix_v = string_copyn(addr->local_part, vlen);
}
else
- addr->prefix = string_copyn_taint(addr->local_part, plen, FALSE);
+ addr->prefix = string_copyn_taint(addr->local_part, plen, GET_UNTAINTED);
addr->local_part += plen;
DEBUG(D_route) debug_printf("stripped prefix %s\n", addr->prefix);
}
it have been validated by the lookup. */
if (yield && ret_key)
- yield = string_copy_taint(keystring, FALSE);
+ yield = string_copy_taint(keystring, GET_UNTAINTED);
return yield;
}
uschar * dest_qname = queue_name_dest ? queue_name_dest : queue_name;
/* Since we are working within the spool, de-taint the dest queue name */
-dest_qname = string_copy_taint(dest_qname, FALSE);
+dest_qname = string_copy_taint(dest_qname, GET_UNTAINTED);
/* Create any output directories that do not exist. */
if (is_tainted(path))
{
DEBUG(D_transport) debug_printf("de-tainting path '%s'\n", path);
- path = string_copy_taint(path, FALSE);
+ path = string_copy_taint(path, GET_UNTAINTED);
}
if (is_tainted(path)) goto tainted_ret_panic;
if (ob->create_file == create_belowhome)
{
DEBUG(D_transport) debug_printf("de-tainting path '%s'\n", path);
- path = string_copy_taint(path, FALSE);
+ path = string_copy_taint(path, GET_UNTAINTED);
}
else
goto tainted_ret_panic;
if (n > 4)
save_errno = (buf[1] << 24) | (buf[2] << 16) | (buf[3] << 8) | buf[4];
if ((recipient_verify_failure = n > 5
- ? string_copyn_taint(buf+5, n-5, FALSE) : NULL))
+ ? string_copyn_taint(buf+5, n-5, GET_UNTAINTED) : NULL))
{
int m;
s = buf + 5 + Ustrlen(recipient_verify_failure) + 1;
m = n - (s - buf);
acl_verify_message = *msg =
- m > 0 ? string_copyn_taint(s, m, FALSE) : NULL;
+ m > 0 ? string_copyn_taint(s, m, GET_UNTAINTED) : NULL;
}
DEBUG(D_verify) debug_printf_indent("verify call response:"