If an optional key is not found, then leave source set to NULL. (Philip Craig)

diff --git a/src/ulogd.c b/src/ulogd.c
index 4097983b2285e7a0298157c52eb30682ae26ddab..0742925e898a6342c157c2ad596d64f3780e03f8 100644 (file)
--- 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);