projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pipe transport: expand the path option
[exim.git]
/
src
/
src
/
transports
/
pipe.c
diff --git
a/src/src/transports/pipe.c
b/src/src/transports/pipe.c
index 3366a6dcfc64997e6bfd5c6233141f15fb29bf6c..0535b674332103bf573922aabb8ecbb5ad4bc13b 100644
(file)
--- a/
src/src/transports/pipe.c
+++ b/
src/src/transports/pipe.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
4
*/
+/* Copyright (c) University of Cambridge 1995 - 201
5
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-326,22
+326,20
@@
Returns: TRUE if all went well; otherwise an error will be
*/
static BOOL
*/
static BOOL
-set_up_direct_command(
uschar ***argvptr, uschar *cmd, BOOL expand_arguments
,
- int expand_fail, address_item *addr, uschar *tname,
+set_up_direct_command(
const uschar ***argvptr, uschar *cmd
,
+
BOOL expand_arguments,
int expand_fail, address_item *addr, uschar *tname,
pipe_transport_options_block *ob)
{
BOOL permitted = FALSE;
pipe_transport_options_block *ob)
{
BOOL permitted = FALSE;
-uschar **argv;
-uschar buffer[64];
+const uschar **argv;
/* Set up "transport <name>" to be put in any error messages, and then
call the common function for creating an argument list and expanding
the items if necessary. If it fails, this function fails (error information
is in the addresses). */
/* Set up "transport <name>" to be put in any error messages, and then
call the common function for creating an argument list and expanding
the items if necessary. If it fails, this function fails (error information
is in the addresses). */
-sprintf(CS buffer, "%.50s transport", tname);
if (!transport_set_up_command(argvptr, cmd, expand_arguments, expand_fail,
if (!transport_set_up_command(argvptr, cmd, expand_arguments, expand_fail,
- addr,
buffer
, NULL))
+ addr,
string_sprintf("%.50s transport", tname)
, NULL))
return FALSE;
/* Point to the set-up arguments. */
return FALSE;
/* Point to the set-up arguments. */
@@
-350,14
+348,13
@@
argv = *argvptr;
/* If allow_commands is set, see if the command is in the permitted list. */
/* If allow_commands is set, see if the command is in the permitted list. */
-if (ob->allow_commands
!= NULL
)
+if (ob->allow_commands)
{
int sep = 0;
{
int sep = 0;
-
uschar *s, *p
;
- uschar
buffer[256]
;
+
const uschar *s
;
+ uschar
*p
;
- s = expand_string(ob->allow_commands);
- if (s == NULL)
+ if (!(s = expand_string(ob->allow_commands)))
{
addr->transport_return = DEFER;
addr->message = string_sprintf("failed to expand string \"%s\" "
{
addr->transport_return = DEFER;
addr->message = string_sprintf("failed to expand string \"%s\" "
@@
-365,10
+362,8
@@
if (ob->allow_commands != NULL)
return FALSE;
}
return FALSE;
}
- while ((p = string_nextinlist(&s, &sep, buffer, sizeof(buffer))) != NULL)
- {
+ while ((p = string_nextinlist(&s, &sep, NULL, 0)))
if (Ustrcmp(p, argv[0]) == 0) { permitted = TRUE; break; }
if (Ustrcmp(p, argv[0]) == 0) { permitted = TRUE; break; }
- }
}
/* If permitted is TRUE it means the command was found in the allowed list, and
}
/* If permitted is TRUE it means the command was found in the allowed list, and
@@
-391,7
+386,7
@@
if (!permitted)
}
}
}
}
- else if (ob->allow_commands
!= NULL
)
+ else if (ob->allow_commands)
{
addr->transport_return = FAIL;
addr->message = string_sprintf("\"%s\" command not permitted by %s "
{
addr->transport_return = FAIL;
addr->message = string_sprintf("\"%s\" command not permitted by %s "
@@
-407,10
+402,9
@@
if (argv[0][0] != '/')
{
int sep = 0;
uschar *p;
{
int sep = 0;
uschar *p;
- uschar *listptr = ob->path;
- uschar buffer[1024];
+ const uschar *listptr = expand_string(ob->path);
- while ((p = string_nextinlist(&listptr, &sep,
buffer, sizeof(buffer))) != NULL
)
+ while ((p = string_nextinlist(&listptr, &sep,
NULL, 0))
)
{
struct stat statbuf;
sprintf(CS big_buffer, "%.256s/%.256s", p, argv[0]);
{
struct stat statbuf;
sprintf(CS big_buffer, "%.256s/%.256s", p, argv[0]);
@@
-420,7
+414,7
@@
if (argv[0][0] != '/')
break;
}
}
break;
}
}
- if (
p == NULL
)
+ if (
!p
)
{
addr->transport_return = FAIL;
addr->message = string_sprintf("\"%s\" command not found for %s transport",
{
addr->transport_return = FAIL;
addr->message = string_sprintf("\"%s\" command not found for %s transport",
@@
-453,10
+447,10
@@
Returns: TRUE if all went well; otherwise an error will be
*/
static BOOL
*/
static BOOL
-set_up_shell_command(
uschar ***argvptr, uschar *cmd, BOOL expand_arguments
,
- int expand_fail, address_item *addr, uschar *tname)
+set_up_shell_command(
const uschar ***argvptr, uschar *cmd
,
+
BOOL expand_arguments,
int expand_fail, address_item *addr, uschar *tname)
{
{
-uschar **argv;
+
const
uschar **argv;
*argvptr = argv = store_get((4)*sizeof(uschar *));
*argvptr = argv = store_get((4)*sizeof(uschar *));
@@
-491,11
+485,12
@@
if (expand_arguments)
for (ad = addr; ad != NULL; ad = ad->next)
{
for (ad = addr; ad != NULL; ad = ad->next)
{
- if (ad != addr) string_cat(s, &size, &offset, US" ", 1);
- string_cat(s, &size, &offset, ad->address, Ustrlen(ad->address));
+ /*XXX string_append_listele() ? */
+ if (ad != addr) s = string_catn(s, &size, &offset, US" ", 1);
+ s = string_cat(s, &size, &offset, ad->address);
}
}
- s
tring_cat(s, &size, &offset, q, Ustrlen(q)
);
+ s
= string_cat(s, &size, &offset, q
);
s[offset] = 0;
}
s[offset] = 0;
}
@@
-551,11
+546,18
@@
pipe_transport_options_block *ob =
int timeout = ob->timeout;
BOOL written_ok = FALSE;
BOOL expand_arguments;
int timeout = ob->timeout;
BOOL written_ok = FALSE;
BOOL expand_arguments;
-uschar **argv;
+
const
uschar **argv;
uschar *envp[50];
uschar *envp[50];
-uschar *envlist = ob->environment;
+
const
uschar *envlist = ob->environment;
uschar *cmd, *ss;
uschar *cmd, *ss;
-uschar *eol = (ob->use_crlf)? US"\r\n" : US"\n";
+uschar *eol = ob->use_crlf ? US"\r\n" : US"\n";
+transport_ctx tctx = {
+ tblock,
+ addr,
+ ob->check_string,
+ ob->escape_string,
+ ob->options /* set at initialization time */
+};
DEBUG(D_transport) debug_printf("%s transport entered\n", tblock->name);
DEBUG(D_transport) debug_printf("%s transport entered\n", tblock->name);
@@
-612,7
+614,7
@@
if (cmd == NULL || *cmd == '\0')
and numerical the variables in existence. These are passed in
addr->pipe_expandn for use here. */
and numerical the variables in existence. These are passed in
addr->pipe_expandn for use here. */
-if (expand_arguments && addr->pipe_expandn
!= NULL
)
+if (expand_arguments && addr->pipe_expandn)
{
uschar **ss = addr->pipe_expandn;
expand_nmax = -1;
{
uschar **ss = addr->pipe_expandn;
expand_nmax = -1;
@@
-652,7
+654,7
@@
envp[envcount++] = string_sprintf("LOCAL_PART_SUFFIX=%#s",
envp[envcount++] = string_sprintf("DOMAIN=%s", deliver_domain);
envp[envcount++] = string_sprintf("HOME=%#s", deliver_home);
envp[envcount++] = string_sprintf("MESSAGE_ID=%s", message_id);
envp[envcount++] = string_sprintf("DOMAIN=%s", deliver_domain);
envp[envcount++] = string_sprintf("HOME=%#s", deliver_home);
envp[envcount++] = string_sprintf("MESSAGE_ID=%s", message_id);
-envp[envcount++] = string_sprintf("PATH=%s",
ob->path
);
+envp[envcount++] = string_sprintf("PATH=%s",
expand_string(ob->path)
);
envp[envcount++] = string_sprintf("RECIPIENT=%#s%#s%#s@%#s",
deliver_localpart_prefix, deliver_localpart, deliver_localpart_suffix,
deliver_domain);
envp[envcount++] = string_sprintf("RECIPIENT=%#s%#s%#s@%#s",
deliver_localpart_prefix, deliver_localpart, deliver_localpart_suffix,
deliver_domain);
@@
-669,9
+671,9
@@
else if (timezone_string != NULL && timezone_string[0] != 0)
/* Add any requested items */
/* Add any requested items */
-if (envlist
!= NULL
)
+if (envlist)
{
{
- envlist = expand_string(envlist);
+ envlist = expand_
c
string(envlist);
if (envlist == NULL)
{
addr->transport_return = DEFER;
if (envlist == NULL)
{
addr->transport_return = DEFER;
@@
-729,7
+731,7
@@
reading of the output pipe. */
uid/gid and current directory. Request that the new process be a process group
leader, so we can kill it and all its children on a timeout. */
uid/gid and current directory. Request that the new process be a process group
leader, so we can kill it and all its children on a timeout. */
-if ((pid = child_open(argv, envp, ob->umask, &fd_in, &fd_out, TRUE)) < 0)
+if ((pid = child_open(
USS
argv, envp, ob->umask, &fd_in, &fd_out, TRUE)) < 0)
{
addr->transport_return = DEFER;
addr->message = string_sprintf(
{
addr->transport_return = DEFER;
addr->message = string_sprintf(
@@
-843,31
+845,27
@@
if (ob->use_bsmtp)
if (!transport_write_string(fd_in, "MAIL FROM:<%s>%s", return_path, eol))
goto END_WRITE;
if (!transport_write_string(fd_in, "MAIL FROM:<%s>%s", return_path, eol))
goto END_WRITE;
- for (a = addr; a != NULL; a = a->next)
- {
+ for (a = addr; a; a = a->next)
if (!transport_write_string(fd_in,
"RCPT TO:<%s>%s",
transport_rcpt_address(a, tblock->rcpt_include_affixes),
eol))
goto END_WRITE;
if (!transport_write_string(fd_in,
"RCPT TO:<%s>%s",
transport_rcpt_address(a, tblock->rcpt_include_affixes),
eol))
goto END_WRITE;
- }
if (!transport_write_string(fd_in, "DATA%s", eol)) goto END_WRITE;
}
if (!transport_write_string(fd_in, "DATA%s", eol)) goto END_WRITE;
}
-/* Now the actual message
- the options were set at initialization time
*/
+/* Now the actual message */
-if (!transport_write_message(addr, fd_in, ob->options, 0, tblock->add_headers,
- tblock->remove_headers, ob->check_string, ob->escape_string,
- tblock->rewrite_rules, tblock->rewrite_existflags))
+if (!transport_write_message(fd_in, &tctx, 0))
goto END_WRITE;
/* Now any configured suffix */
goto END_WRITE;
/* Now any configured suffix */
-if (ob->message_suffix
!= NULL
)
+if (ob->message_suffix)
{
uschar *suffix = expand_string(ob->message_suffix);
{
uschar *suffix = expand_string(ob->message_suffix);
- if (
suffix == NULL
)
+ if (
!suffix
)
{
addr->transport_return = search_find_defer? DEFER : PANIC;
addr->message = string_sprintf("Expansion of \"%s\" (suffix for %s "
{
addr->transport_return = search_find_defer? DEFER : PANIC;
addr->message = string_sprintf("Expansion of \"%s\" (suffix for %s "
@@
-1073,16
+1071,13
@@
if ((rc = child_close(pid, timeout)) != 0)
else
{
else
{
- uschar *s = ob->temp_errors;
+
const
uschar *s = ob->temp_errors;
uschar *p;
uschar *p;
- uschar buffer[64];
int sep = 0;
addr->transport_return = FAIL;
int sep = 0;
addr->transport_return = FAIL;
- while ((p = string_nextinlist(&s,&sep,buffer,sizeof(buffer))) != NULL)
- {
+ while ((p = string_nextinlist(&s,&sep,NULL,0)))
if (rc == Uatoi(p)) { addr->transport_return = DEFER; break; }
if (rc == Uatoi(p)) { addr->transport_return = DEFER; break; }
- }
}
/* Ensure the message contains the expanded command and arguments. This
}
/* Ensure the message contains the expanded command and arguments. This
@@
-1104,36
+1099,33
@@
if ((rc = child_close(pid, timeout)) != 0)
if (*ss != 0)
{
if (*ss != 0)
{
- addr->message = string_cat(addr->message, &size, &ptr, US" ", 1);
- addr->message = string_cat(addr->message, &size, &ptr,
- ss, Ustrlen(ss));
+ addr->message = string_catn(addr->message, &size, &ptr, US" ", 1);
+ addr->message = string_cat (addr->message, &size, &ptr, ss);
}
/* Now add the command and arguments */
}
/* Now add the command and arguments */
- addr->message = string_cat(addr->message, &size, &ptr,
+ addr->message = string_cat
n
(addr->message, &size, &ptr,
US" from command:", 14);
for (i = 0; i < sizeof(argv)/sizeof(int *) && argv[i] != NULL; i++)
{
BOOL quote = FALSE;
US" from command:", 14);
for (i = 0; i < sizeof(argv)/sizeof(int *) && argv[i] != NULL; i++)
{
BOOL quote = FALSE;
- addr->message = string_cat(addr->message, &size, &ptr, US" ", 1);
+ addr->message = string_cat
n
(addr->message, &size, &ptr, US" ", 1);
if (Ustrpbrk(argv[i], " \t") != NULL)
{
quote = TRUE;
if (Ustrpbrk(argv[i], " \t") != NULL)
{
quote = TRUE;
- addr->message = string_cat(addr->message, &size, &ptr, US"\"", 1);
+ addr->message = string_cat
n
(addr->message, &size, &ptr, US"\"", 1);
}
}
- addr->message = string_cat(addr->message, &size, &ptr, argv[i],
- Ustrlen(argv[i]));
+ addr->message = string_cat(addr->message, &size, &ptr, argv[i]);
if (quote)
if (quote)
- addr->message = string_cat(addr->message, &size, &ptr, US"\"", 1);
+ addr->message = string_cat
n
(addr->message, &size, &ptr, US"\"", 1);
}
/* Add previous filter timeout message, if present. */
}
/* Add previous filter timeout message, if present. */
- if (*tmsg != 0)
- addr->message = string_cat(addr->message, &size, &ptr, tmsg,
- Ustrlen(tmsg));
+ if (*tmsg)
+ addr->message = string_cat(addr->message, &size, &ptr, tmsg);
addr->message[ptr] = 0; /* Ensure concatenated string terminated */
}
addr->message[ptr] = 0; /* Ensure concatenated string terminated */
}
projects / exim.git / blobdiff