summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org>2006-05-23 08:46:18 +0000
committer/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org>2006-05-23 08:46:18 +0000
commit5f738b5660fc5abf6e21b527bb6f946bbaaa31db (patch)
tree7c7276deffa4955ddac910425400a70cd13ed534
parentbf8b9dfa16409f7f0b740bccf7bce0724db5d27d (diff)
If an optional key is not found, then leave source set to NULL. (Philip Craig)
-rw-r--r--src/ulogd.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ulogd.c b/src/ulogd.c
index 4097983..0742925 100644
--- a/src/ulogd.c
+++ b/src/ulogd.c
@@ -560,8 +560,9 @@ create_stack_resolve_keys(struct ulogd_pluginstance_stack *stack)
okey = find_okey_in_stack(ikey->name,
stack, pi_cur);
- if (!okey &&
- !(ikey->flags & ULOGD_KEYF_OPTIONAL)) {
+ if (!okey) {
+ if (ikey->flags & ULOGD_KEYF_OPTIONAL)
+ continue;
ulogd_log(ULOGD_ERROR, "cannot find "
"key `%s' in stack\n",
ikey->name);