git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix -bi. Bug 2590
[users/jgh/exim.git]
/
src
/
src
/
exim.c
diff --git
a/src/src/exim.c
b/src/src/exim.c
index 2f4149f6f55bb23fdf0de097b4333bb0514861a1..0b7b87ed58be01ead8750da9a0518d662b2dd2c7 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-2149,7
+2149,7
@@
on the second character (the one after '-'), to save some effort. */
concept of *the* alias file, but since Sun's YP make script calls
sendmail this way, some support must be provided. */
case 'i':
concept of *the* alias file, but since Sun's YP make script calls
sendmail this way, some support must be provided. */
case 'i':
- if (!*
++
argrest) bi_option = TRUE;
+ if (!*argrest) bi_option = TRUE;
else badarg = TRUE;
break;
else badarg = TRUE;
break;
@@
-4117,7
+4117,7
@@
script. */
if (bi_option)
{
(void)fclose(config_file);
if (bi_option)
{
(void)fclose(config_file);
- if (bi_command)
+ if (bi_command
&& *bi_command
)
{
int i = 0;
uschar *argv[3];
{
int i = 0;
uschar *argv[3];
@@
-4128,11
+4128,11
@@
if (bi_option)
setgroups(group_count, group_list);
exim_setugid(real_uid, real_gid, FALSE, US"running bi_command");
setgroups(group_count, group_list);
exim_setugid(real_uid, real_gid, FALSE, US"running bi_command");
- DEBUG(D_exec) debug_printf("exec
%.256s %.256
s\n", argv[0],
- argv[1] ?
argv[1] : US
"");
+ DEBUG(D_exec) debug_printf("exec
'%.256s' %s%.256s%
s\n", argv[0],
+ argv[1] ?
"'" : "", argv[1] ? argv[1] : US"", argv[1] ? "'" :
"");
execv(CS argv[0], (char *const *)argv);
execv(CS argv[0], (char *const *)argv);
- exim_fail("exim: exec
failed: %s\n"
, strerror(errno));
+ exim_fail("exim: exec
'%s' failed: %s\n", argv[0]
, strerror(errno));
}
else
{
}
else
{