diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2022-11-12 20:13:32 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2022-12-12 19:25:45 +0000 |
| commit | 60b8e1d8c24d1ab487134d8b5fb1e8523f786c33 (patch) | |
| tree | b31e4177b022078d0049dabae65cafe51bfe8be5 /src | |
| parent | 520ef00f56cea3d35688bf4e13599a6e37ba275f (diff) | |
| download | exim4-60b8e1d8c24d1ab487134d8b5fb1e8523f786c33.tar.gz | |
tidying
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/daemon.c | 12 | ||||
| -rw-r--r-- | src/src/expand.c | 9 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/src/daemon.c b/src/src/daemon.c index be008c3d4..05ef3bfdd 100644 --- a/src/src/daemon.c +++ b/src/src/daemon.c @@ -1258,10 +1258,14 @@ if (sz >= sizeof(buf)) return FALSE; #ifdef notdef debug_printf("addrlen %d\n", msg.msg_namelen); #endif -DEBUG(D_queue_run) debug_printf("%s from addr '%s%.*s'\n", __FUNCTION__, - *sa_un.sun_path ? "" : "@", - (int)msg.msg_namelen - (*sa_un.sun_path ? 0 : 1), - sa_un.sun_path + (*sa_un.sun_path ? 0 : 1)); +DEBUG(D_queue_run) + if (msg.msg_namelen > 0) + debug_printf("%s from addr '%s%.*s'\n", __FUNCTION__, + *sa_un.sun_path ? "" : "@", + (int)msg.msg_namelen - (*sa_un.sun_path ? 0 : 1), + sa_un.sun_path + (*sa_un.sun_path ? 0 : 1)); + else + debug_printf("%s (from unknown addr)\n", __FUNCTION__); /* Refuse to handle the item unless the peer has good credentials */ #ifdef SCM_CREDENTIALS diff --git a/src/src/expand.c b/src/src/expand.c index 7bb2e4274..62b4a1890 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -4853,11 +4853,11 @@ while (*s) switch(read_subs(sub_arg, nelem(sub_arg), 1, &s, flags, TRUE, name, &resetok, NULL)) { + case -1: continue; /* If skipping, we don't actually do anything */ case 1: goto EXPAND_FAILED_CURLY; case 2: case 3: goto EXPAND_FAILED; } - /*XXX no skipping-optimisation? */ yield = string_append(yield, 3, US"Authentication-Results: ", sub_arg[0], US"; none"); @@ -4944,7 +4944,6 @@ while (*s) case 2: case 3: goto EXPAND_FAILED; } - /*XXX no skipping-optimisation? */ if (!sub_arg[1]) /* One argument */ { @@ -5439,15 +5438,12 @@ while (*s) switch(read_subs(sub_arg, 2, 1, &s, flags, TRUE, name, &resetok, NULL)) { + case -1: continue; /* If skipping, we don't actually do anything */ case 1: goto EXPAND_FAILED_CURLY; case 2: case 3: goto EXPAND_FAILED; } - /* If skipping, we don't actually do anything */ - - if (flags & ESI_SKIPPING) continue; - /* Open the file and read it */ if (!(f = Ufopen(sub_arg[0], "rb"))) @@ -6327,6 +6323,7 @@ while (*s) save_expand_strings(save_expand_nstring, save_expand_nlength); /* Read the field & list arguments */ + /*XXX Could we use read_subs here (and get better efficiency for skipping)? */ for (int i = 0; i < 2; i++) { |