[netfilter-cvslog] r6612 - branches/ulog/ulogd2/src

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2006-05-23 10:46:18 +0200 (Tue, 23 May 2006)
New Revision: 6612

Modified:
   branches/ulog/ulogd2/src/ulogd.c
Log:
If an optional key is not found, then leave source set to NULL. (Philip Craig)


Modified: branches/ulog/ulogd2/src/ulogd.c
===================================================================
--- branches/ulog/ulogd2/src/ulogd.c	2006-05-23 08:45:25 UTC (rev 6611)
+++ branches/ulog/ulogd2/src/ulogd.c	2006-05-23 08:46:18 UTC (rev 6612)
@@ -560,8 +560,9 @@
 
 				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);